diff --git a/openstack_dashboard/test/integration_tests/config.py b/openstack_dashboard/test/integration_tests/config.py index ee6eb0b413..1d1436af77 100644 --- a/openstack_dashboard/test/integration_tests/config.py +++ b/openstack_dashboard/test/integration_tests/config.py @@ -123,7 +123,7 @@ SeleniumGroup = [ help='Timeout in seconds to wait for a page to become available'), cfg.StrOpt( 'screenshots_directory', - default='integration_tests_screenshots', + default='test_reports', help='Output directory for screenshots'), cfg.BoolOpt( 'maximize_browser', diff --git a/openstack_dashboard/test/integration_tests/helpers.py b/openstack_dashboard/test/integration_tests/helpers.py index 273b2e163c..6cb1f24a7e 100644 --- a/openstack_dashboard/test/integration_tests/helpers.py +++ b/openstack_dashboard/test/integration_tests/helpers.py @@ -224,9 +224,9 @@ class BaseTestCase(testtools.TestCase): @property def _test_report_dir(self): - report_dir = os.path.join(ROOT_PATH, 'test_reports', - '{}.{}'.format(self.__class__.__name__, - self._testMethodName)) + report_dir = os.path.join( + ROOT_PATH, self.CONFIG.selenium.screenshots_directory, + '{}.{}'.format(self.__class__.__name__, self._testMethodName)) if not os.path.isdir(report_dir): os.makedirs(report_dir) return report_dir diff --git a/openstack_dashboard/test/integration_tests/horizon.conf b/openstack_dashboard/test/integration_tests/horizon.conf index a909e478a5..aa54b9394c 100644 --- a/openstack_dashboard/test/integration_tests/horizon.conf +++ b/openstack_dashboard/test/integration_tests/horizon.conf @@ -20,7 +20,7 @@ page_timeout=60 # Output directory for screenshots. # (string value) -screenshots_directory=integration_tests_screenshots +screenshots_directory=test_reports # Implicit timeout to wait until element become available, # this timeout is used for every find_element, find_elements call.