openstack/deb-tempest
Code Issues Proposed changes

Merge "Remove redundant import from scenario tests"

Browse Source
This commit is contained in:
Jenkins 2016-02-06 00:42:35 +00:00 committed by Gerrit Code Review
commit 97f119f978
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tempest/scenario/test_shelve_instance.py
View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log
import testtools
from tempest.common import waiters
@ -23,8 +22,6 @@ from tempest import test
CONF = config.CONF
LOG = log.getLogger(__name__)
class TestShelveInstance(manager.ScenarioTest):
"""This test shelves then unshelves a Nova instance

3
tempest/scenario/test_snapshot_pattern.py
View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log
import testtools
from tempest import config
@ -22,8 +21,6 @@ from tempest import test
CONF = config.CONF
LOG = log.getLogger(__name__)
class TestSnapshotPattern(manager.ScenarioTest):
"""This test is for snapshotting an instance and booting with it.

10
tempest/scenario/test_stamp_pattern.py
View File

@ -25,10 +25,8 @@ from tempest import config
from tempest import exceptions
from tempest.scenario import manager
from tempest import test
import tempest.test
CONF = config.CONF
LOG = logging.getLogger(__name__)
@ -89,16 +87,16 @@ class TestStampPattern(manager.ScenarioTest):
LOG.debug("Partitions:%s" % part)
return CONF.compute.volume_device_name in part
if not tempest.test.call_until_true(_func,
CONF.compute.build_timeout,
CONF.compute.build_interval):
if not test.call_until_true(_func,
CONF.compute.build_timeout,
CONF.compute.build_interval):
raise exceptions.TimeoutException
@decorators.skip_because(bug="1205344")
@test.idempotent_id('10fd234a-515c-41e5-b092-8323060598c5')
@testtools.skipUnless(CONF.compute_feature_enabled.snapshot,
'Snapshotting is not available.')
@tempest.test.services('compute', 'network', 'volume', 'image')
@test.services('compute', 'network', 'volume', 'image')
def test_stamp_pattern(self):
# prepare for booting an instance
keypair = self.create_keypair()

4
tempest/scenario/test_volume_boot_pattern.py
View File

@ -10,8 +10,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log
from tempest.common.utils import data_utils
from tempest.common import waiters
from tempest import config
@ -20,8 +18,6 @@ from tempest import test
CONF = config.CONF
LOG = log.getLogger(__name__)
class TestVolumeBootPattern(manager.ScenarioTest):