Imported Debian patch 4.7.2-3

2019-05-06 08:43:34 +03:00
parent 27edeba051
commit 8bc559c5a1
917 changed files with 1068993 additions and 1184676 deletions
--- a/ipatests/test_webui/test_dns.py
+++ b/ipatests/test_webui/test_dns.py
@@ -35,8 +35,9 @@ import pytest
@pytest.mark.tier1
 class test_dns(UI_driver):

-    @pytest.fixture(autouse=True)
-    def dns_setup(self, ui_driver_fsetup):
+    def setup(self, *args, **kwargs):
+        super(test_dns, self).setup(*args, **kwargs)
+
        if not self.has_dns():
            self.skip('DNS not configured')