Merge "Support new pytest 8.3.4"

openstack_dashboard/test/integration_tests/basewebobject.py

@@ -26,7 +26,11 @@ class BaseWebObject(unittest.TestCase):
     def __init__(self, driver, conf):
         self.driver = driver
         self.conf = conf
-        self.explicit_wait = self.conf.selenium.explicit_wait
+        if conf is not None and conf.get('selenium', None) is not None:
+            self.explicit_wait = self.conf.selenium.explicit_wait
+        else:
+            self.explicit_wait = 0
+        super().__init__()
 
     def _is_element_present(self, *locator):
         with self.waits_disabled():

openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py

@@ -74,7 +74,7 @@ class InstancesPage(basepage.BaseNavigationPage):
         "//*[contains(@class,'normal_column')][contains(text(),'Active')]"
     )
 
-    def __init__(self, driver, conf):
+    def __init__(self, driver=None, conf=None):
         super().__init__(driver, conf)
         self._page_title = "Instances"
 

openstack_dashboard/test/integration_tests/pages/project/volumes/volumespage.py

@@ -97,7 +97,7 @@ class VolumesPage(basepage.BaseNavigationPage):
     VOLUMES_TABLE_SIZE_COLUMN = 'Size'
     VOLUMES_TABLE_ATTACHED_COLUMN = 'Attached To'
 
-    def __init__(self, driver, conf):
+    def __init__(self, driver=None, conf=None):
         super().__init__(driver, conf)
         self._page_title = "Volumes"