commit 94a520a653a0d71c581b912bcd1c223661b0c489
author rabi <ramishra@redhat.com> Fri Nov 17 22:49:17 2017 +0530
committer rabi <ramishra@redhat.com> Fri Nov 17 23:29:36 2017 +0530
tree 77639e7b88dfd52fdec453bb19cc55e4e6203d09
parent 5eaa496a4c3041405fefcfc4715eb34f913b8a72

Fix imports for test_simultaneous_update

Change-Id: Ide957859f88bcfc9e15057c57d520245023e265d

heat_tempest_plugin/common/test.py

diff --git a/heat_tempest_plugin/common/test.py b/heat_tempest_plugin/common/test.py
index 7db874b..d719ad0 100644
--- a/heat_tempest_plugin/common/test.py
+++ b/heat_tempest_plugin/common/test.py
@@ -73,7 +73,8 @@
 
     The decorated test will be skipped when convergence is disabled.
     '''
-    convergence_enabled = config.CONF.heat_plugin.convergence_engine_enabled
+    plugin = config.CONF.orchestration_plugin
+    convergence_enabled = plugin.convergence_engine_enabled
     skipper = testtools.skipUnless(convergence_enabled,
                                    "Convergence-only tests are disabled")
     return skipper(test_method)

heat_tempest_plugin/tests/functional/test_simultaneous_update.py

diff --git a/heat_tempest_plugin/tests/functional/test_simultaneous_update.py b/heat_tempest_plugin/tests/functional/test_simultaneous_update.py
index 0c562c0..3cfbeaa 100644
--- a/heat_tempest_plugin/tests/functional/test_simultaneous_update.py
+++ b/heat_tempest_plugin/tests/functional/test_simultaneous_update.py
@@ -14,8 +14,8 @@
 import copy
 import time
 
-from heat_integrationtests.common import test
-from heat_integrationtests.functional import functional_base
+from heat_tempest_plugin.common import test
+from heat_tempest_plugin.tests.functional import functional_base
 
 _test_template = {
     'heat_template_version': 'pike',