Imported Debian patch 4.7.2-3

ipatests/test_webui/test_loginscreen.py

@@ -5,7 +5,6 @@
 """
 Test LoginScreen widget and all it's views
 """
-import urllib
 
 from ipatests.test_webui.ui_driver import UI_driver
 from ipatests.test_webui.ui_driver import screenshot
@@ -19,27 +18,28 @@ except ImportError:
     pass
 
 import pytest
+from six.moves import urllib
 
 
 @pytest.mark.tier1
 class TestLoginScreen(UI_driver):
 
-    @pytest.fixture(autouse=True)
-    def loginscreen_setup(self, request, ui_driver_fsetup):
+    def setup(self, *args, **kwargs):
+        super(TestLoginScreen, self).setup(*args, **kwargs)
         self.init_app()
         self.add_test_user()
         self.logout()
 
-        def fin():
-            # log out first
-            if (self.logged_in()):
-                self.logout()
-            else:
-                self.load_url(self.get_base_url())
-            # log in as administrator
-            self.login()
-            self.delete_test_user()
-        request.addfinalizer(fin)
+    def teardown(self, *args, **kwargs):
+        # log out first
+        if (self.logged_in()):
+            self.logout()
+        else:
+            self.load_url(self.get_base_url())
+        # log in as administrator
+        self.login()
+        self.delete_test_user()
+        super(TestLoginScreen, self).teardown(*args, **kwargs)
 
     def delete_test_user(self):
         """
@@ -124,7 +124,6 @@ class TestLoginScreen(UI_driver):
         WebDriverWait(self.driver, 10).until(
             lambda d: runner.files_loaded()
         )
-        self.wait()
 
     def relogin_with_new_password(self):
         """
@@ -158,7 +157,7 @@ class TestLoginScreen(UI_driver):
         new_pass_field.send_keys(new_password)
         verify_pass_field.send_keys(new_password)
         verify_pass_field.send_keys(Keys.RETURN)
-        self.wait(0.5)
+        self.wait()
         self.assert_notification(assert_text='Password change complete',
                                  link_text=link_text, link_url=link_url)
 
@@ -370,7 +369,6 @@ class TestLoginScreen(UI_driver):
         # check click on 'Cancel' button
         self.check_cancel()
         self.button_click_on_login_screen('login')
-        self.wait_for_request()
 
         # check if user is not logged
         assert not self.logged_in()