Fix imports for test_simultaneous_update
Change-Id: Ide957859f88bcfc9e15057c57d520245023e265d
This commit is contained in:
parent
5eaa496a4c
commit
94a520a653
|
@ -73,7 +73,8 @@ def requires_convergence(test_method):
|
|||
|
||||
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)
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Reference in New Issue