openstack
/
ec2-api
Code Issues Proposed changes

Merge "Remove the deprecated tempest.test.attr"

This commit is contained in:
Jenkins 2017-05-25 18:22:14 +00:00 committed by Gerrit Code Review
parent 140af4ae7b 7e28af2fcb
commit cb20528157
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_unixbench.py vendored
View File

@ -17,7 +17,7 @@ from testtools import content as test_content
import tempest.cloudscaling.base as base
import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
from tempest.lib.common.utils.linux import remote_client
from tempest import test
from tempest.lib import decorators
import logging
logging.getLogger('boto').setLevel(logging.CRITICAL)
@ -60,7 +60,7 @@ class UnixBenchTest(base.BaseBenchmarkTest, aws_base.BaseAWSTest):
cls.ssh_user,
pkey=cls.keypair.material)
@test.attr(type='benchmark')
@decorators.attr(type='benchmark')
def test_run_benchmark(self):
"""Run UnixBench test on prepared instance"""
if self.ssh is None:

12
ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_volume_benchmark.py vendored
View File

@ -20,7 +20,7 @@ import tempest.cloudscaling.base as base
import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
import tempest.cloudscaling.utils as utils
from tempest.lib.common.utils.linux import remote_client
from tempest import test
from tempest.lib import decorators
from tempest.thirdparty.boto.utils import wait as boto_wait
import logging
@ -113,7 +113,7 @@ class VolumeBenchmarkTest(base.BaseBenchmarkTest, aws_base.BaseAWSTest):
str(self.test_time) + "s (current) > " +
reference_time[1] + "s (AWS)")
@test.attr(type='benchmark')
@decorators.attr(type='benchmark')
def test_001_attach_volume(self):
"""Attach volume"""
@ -155,7 +155,7 @@ class VolumeBenchmarkTest(base.BaseBenchmarkTest, aws_base.BaseAWSTest):
self._check_test()
@test.attr(type='benchmark')
@decorators.attr(type='benchmark')
def test_002_fill_volume(self):
"""Fill volume with data"""
@ -181,7 +181,7 @@ class VolumeBenchmarkTest(base.BaseBenchmarkTest, aws_base.BaseAWSTest):
self._check_test()
@test.attr(type='benchmark')
@decorators.attr(type='benchmark')
def test_003_snapshot_volume(self):
"""Snapshot volume"""
@ -202,7 +202,7 @@ class VolumeBenchmarkTest(base.BaseBenchmarkTest, aws_base.BaseAWSTest):
self._check_test()
@test.attr(type='benchmark')
@decorators.attr(type='benchmark')
def test_004_clone_volume_snapshot(self):
"""Clone volume"""
@ -224,7 +224,7 @@ class VolumeBenchmarkTest(base.BaseBenchmarkTest, aws_base.BaseAWSTest):
self._check_test()
@test.attr(type='benchmark')
@decorators.attr(type='benchmark')
def test_005_detach_volume(self):
"""Detach volume"""

6
ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_benchmark.py vendored
View File

@ -20,7 +20,7 @@ from tempest.cloudscaling import base
import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
from tempest import exceptions
from tempest.lib.common.utils.linux import remote_client
from tempest import test
from tempest.lib import decorators
import logging
logging.getLogger('boto').setLevel(logging.CRITICAL)
@ -154,7 +154,7 @@ class VPC_Benchmark(aws_base.BaseVPCTest, base.BaseBenchmarkTest):
"%sMbits/sec (current) < %sMbits/sec (AWS)" %
(rate, reference[0]))
@test.attr(type='benchmark')
@decorators.attr(type='benchmark')
def test_001_internal_vpc_tcp_150MB_throughput(self):
"""Measure internal VPC network throughput for 150 MBytes transmit."""
if self.keypair is None:
@ -170,7 +170,7 @@ class VPC_Benchmark(aws_base.BaseVPCTest, base.BaseBenchmarkTest):
"150 MBytes throughput: %s Mbits/sec" % rate))
self._check_test(rate)
@test.attr(type='benchmark')
@decorators.attr(type='benchmark')
def test_002_internal_vpc_tcp_2mins_throughput(self):
"""Measure internal VPC network throughput for 2 mins transmit."""
if self.keypair is None: