Imported Debian patch 4.0.5-6~numeezy

This commit is contained in:
Alexandre Ellert
2016-02-17 15:07:45 +01:00
committed by Mario Fetka
parent c44de33144
commit 10dfc9587b
1203 changed files with 53869 additions and 241462 deletions

View File

@@ -23,7 +23,6 @@ DNS tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
import pytest
ZONE_ENTITY = 'dnszone'
FORWARD_ZONE_ENTITY = 'dnsforwardzone'
@@ -38,6 +37,9 @@ ZONE_DATA = {
'pkey': ZONE_PKEY,
'add': [
('textbox', 'idnsname', ZONE_PKEY),
('textbox', 'idnssoamname', 'ns'),
('textbox', 'ip_address', '192.168.1.1'),
('checkbox', 'force', 'checked'),
],
'mod': [
('checkbox', 'idnsallowsyncptr', 'checked'),
@@ -86,11 +88,10 @@ CONFIG_MOD_DATA = {
}
@pytest.mark.tier1
class test_dns(UI_driver):
def setup(self, *args, **kwargs):
super(test_dns, self).setup(*args, **kwargs)
def __init__(self, *args, **kwargs):
super(test_dns, self).__init__(args, kwargs)
if not self.has_dns():
self.skip('DNS not configured')