openstack/horizon
Code Issues Proposed changes

Merge "Support new pytest 8.3.4"

Browse Source
This commit is contained in:
Zuul
2025-02-24 17:48:57 +00:00
committed by Gerrit Code Review
parent 24274d1e7f 609983c263
commit 378addadbe
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/test/integration_tests/basewebobject.py
View File

@@ -26,7 +26,11 @@ class BaseWebObject(unittest.TestCase):
def __init__(self, driver, conf): def __init__(self, driver, conf):
self.driver = driver self.driver = driver
self.conf = conf 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): def _is_element_present(self, *locator):
with self.waits_disabled(): with self.waits_disabled():

2
openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py
View File

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

2
openstack_dashboard/test/integration_tests/pages/project/volumes/volumespage.py
View File

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