Imported Debian patch 4.0.5-6~numeezy

ipatests/test_webui/test_trust.py

@@ -24,7 +24,6 @@ Trust tests
 from ipatests.test_webui.ui_driver import UI_driver
 from ipatests.test_webui.ui_driver import screenshot
 from ipatests.test_webui.task_range import range_tasks
-import pytest
 
 ENTITY = 'trust'
 CONFIG_ENTITY = 'trustconfig'
@@ -42,7 +41,6 @@ CONFIG_DATA2 = {
 }
 
 
-@pytest.mark.tier1
 class trust_tasks(UI_driver):
 
     def get_data(self, add_data=None):
@@ -95,11 +93,11 @@ class trust_tasks(UI_driver):
         return domain.upper() + '_id_range'
 
 
-@pytest.mark.tier1
 class test_trust(trust_tasks):
 
-    def setup(self, *args, **kwargs):
-        super(test_trust, self).setup(*args, **kwargs)
+    def __init__(self, *args, **kwargs):
+        super(test_trust, self).__init__(args, kwargs)
+
         if not self.has_trusts():
             self.skip('Trusts not configured')
 
@@ -123,8 +121,7 @@ class test_trust(trust_tasks):
 
         self.init_app()
 
-        r_tasks = range_tasks()
-        r_tasks.setup(self.driver, self.config)
+        r_tasks = range_tasks(self.driver, self.config)
         r_tasks.get_shifts()
         range_add = r_tasks.get_add_data('')
         base_id = range_add[2][2]