commit 0b430ef949ff6396951b2807a3b211cee7ee2606
author Jenkins <jenkins@review.openstack.org> Tue Jun 13 11:51:59 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jun 13 11:51:59 2017 +0000
tree b65be22d373c36a559e2adaa7b5b10caea048a86
parent 51995f7fd549b9316b6731fc6ecdd37f23ca7212
parent d9d5f1551deaad031876e2b2d56506abecff196a

Merge "Show team and repo badges on README"

tempest_horizon/plugin.py

diff --git a/tempest_horizon/plugin.py b/tempest_horizon/plugin.py
index e873ac3..b1817dc 100644
--- a/tempest_horizon/plugin.py
+++ b/tempest_horizon/plugin.py
@@ -35,8 +35,8 @@
                                   dash_config.ServiceAvailableGroup)
 
     def get_opt_lists(self):
-        return [(dash_config.dashboard_group.name,
-                 dash_config.DashboardGroup),
-                (dash_config.service_available_group.name,
-                 dash_config.ServiceAvailableGroup),
-               ]
+        return [
+            (dash_config.dashboard_group.name, dash_config.DashboardGroup),
+            (dash_config.service_available_group.name,
+                dash_config.ServiceAvailableGroup),
+        ]

tempest_horizon/tests/scenario/test_dashboard_basic_ops.py

diff --git a/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py b/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py
index e4a13d9..a7cd4dd 100644
--- a/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py
+++ b/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py
@@ -17,7 +17,7 @@
 from six.moves.urllib import request
 
 from tempest import config
-from tempest.scenario import manager
+from tempest.lib import decorators
 from tempest import test
 
 import ssl
@@ -59,7 +59,7 @@
             self.login = self._find_attr_value(attrs, 'action')
 
 
-class TestDashboardBasicOps(manager.ScenarioTest):
+class TestDashboardBasicOps(test.BaseTestCase):
 
     """The test suite for dashboard basic operations
 
@@ -70,6 +70,8 @@
     """
     opener = None
 
+    credentials = ['primary']
+
     @classmethod
     def skip_checks(cls):
         super(TestDashboardBasicOps, cls).skip_checks()
@@ -133,9 +135,9 @@
         return ((sys.version_info[0] == 2 and sys.version_info[2] >= 9) or
                 (sys.version_info[0] == 3))
 
-    @test.idempotent_id('4f8851b1-0e69-482b-b63b-84c6e76f6c80')
+    @decorators.idempotent_id('4f8851b1-0e69-482b-b63b-84c6e76f6c80')
     def test_basic_scenario(self):
-        creds = self.os.credentials
+        creds = self.os_primary.credentials
         self.check_login_page()
         self.user_login(creds.username, creds.password)
         self.check_home_page()