openstack
/
tempest
Code Issues Proposed changes

Don't include boto tests as part of smoke tests 

Tests with the smoke attribute are used all over when we want to run a
subset of tempest. The smoke job is supposed to be a subset that gives
us the most bang for the buck in functional test validation. The ec2 api
falls outside of that being a third party api its always going to be
extra.

Change-Id: I474ada06064d2b236f52e623f7bc19326e711977
This commit is contained in:
Joe Gordon 2014-06-17 16:17:09 -07:00
parent d14a33ace3
commit 1e5f364b48
8 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/thirdparty/boto/test_ec2_instance_run.py vendored
View File

@ -20,7 +20,6 @@ from tempest.common.utils.linux import remote_client
from tempest import config
from tempest import exceptions
from tempest.openstack.common import log as logging
from tempest import test
from tempest.thirdparty.boto import test as boto_test
from tempest.thirdparty.boto.utils import s3
from tempest.thirdparty.boto.utils import wait
@ -83,7 +82,6 @@ class InstanceRunTest(boto_test.BotoTestCase):
raise exceptions.EC2RegisterImageException(image_id=
image["image_id"])
@test.attr(type='smoke')
def test_run_idempotent_instances(self):
# EC2 run instances idempotently
@ -121,7 +119,6 @@ class InstanceRunTest(boto_test.BotoTestCase):
_terminate_reservation(reservation_1, rcuk_1)
_terminate_reservation(reservation_2, rcuk_2)
@test.attr(type='smoke')
def test_run_stop_terminate_instance(self):
# EC2 run, stop and terminate instance
image_ami = self.ec2_client.get_image(self.images["ami"]
@ -146,7 +143,6 @@ class InstanceRunTest(boto_test.BotoTestCase):
instance.terminate()
self.cancelResourceCleanUp(rcuk)
@test.attr(type='smoke')
def test_run_stop_terminate_instance_with_tags(self):
# EC2 run, stop and terminate instance with tags
image_ami = self.ec2_client.get_image(self.images["ami"]
@ -193,7 +189,6 @@ class InstanceRunTest(boto_test.BotoTestCase):
instance.terminate()
self.cancelResourceCleanUp(rcuk)
@test.attr(type='smoke')
def test_run_terminate_instance(self):
# EC2 run, terminate immediately
image_ami = self.ec2_client.get_image(self.images["ami"]
@ -217,7 +212,6 @@ class InstanceRunTest(boto_test.BotoTestCase):
else:
self.assertNotEqual(instance.state, "running")
@test.attr(type='smoke')
def test_compute_with_volumes(self):
# EC2 1. integration test (not strict)
image_ami = self.ec2_client.get_image(self.images["ami"]["image_id"])

4
tempest/thirdparty/boto/test_ec2_keys.py vendored
View File

@ -32,7 +32,6 @@ class EC2KeysTest(boto_test.BotoTestCase):
cls.ec = cls.ec2_error_code
# TODO(afazekas): merge create, delete, get test cases
@test.attr(type='smoke')
def test_create_ec2_keypair(self):
# EC2 create KeyPair
key_name = data_utils.rand_name("keypair-")
@ -42,7 +41,6 @@ class EC2KeysTest(boto_test.BotoTestCase):
self.client.get_key_pair(key_name)))
@test.skip_because(bug="1072318")
@test.attr(type='smoke')
def test_delete_ec2_keypair(self):
# EC2 delete KeyPair
key_name = data_utils.rand_name("keypair-")
@ -50,7 +48,6 @@ class EC2KeysTest(boto_test.BotoTestCase):
self.client.delete_key_pair(key_name)
self.assertIsNone(self.client.get_key_pair(key_name))
@test.attr(type='smoke')
def test_get_ec2_keypair(self):
# EC2 get KeyPair
key_name = data_utils.rand_name("keypair-")
@ -59,7 +56,6 @@ class EC2KeysTest(boto_test.BotoTestCase):
self.assertTrue(compare_key_pairs(keypair,
self.client.get_key_pair(key_name)))
@test.attr(type='smoke')
def test_duplicate_ec2_keypair(self):
# EC2 duplicate KeyPair
key_name = data_utils.rand_name("keypair-")

1
tempest/thirdparty/boto/test_ec2_network.py vendored
View File

@ -26,7 +26,6 @@ class EC2NetworkTest(boto_test.BotoTestCase):
# Note(afazekas): these tests for things duable without an instance
@test.skip_because(bug="1080406")
@test.attr(type='smoke')
def test_disassociate_not_associated_floating_ip(self):
# EC2 disassociate not associated floating ip
ec2_codes = self.ec2_error_code

2
tempest/thirdparty/boto/test_ec2_security_groups.py vendored
View File

@ -14,7 +14,6 @@
# under the License.
from tempest.common.utils import data_utils
from tempest import test
from tempest.thirdparty.boto import test as boto_test
@ -25,7 +24,6 @@ class EC2SecurityGroupTest(boto_test.BotoTestCase):
super(EC2SecurityGroupTest, cls).setUpClass()
cls.client = cls.os.ec2api_client
@test.attr(type='smoke')
def test_create_authorize_security_group(self):
# EC2 Create, authorize/revoke security group
group_name = data_utils.rand_name("securty_group-")

3
tempest/thirdparty/boto/test_ec2_volumes.py vendored
View File

@ -15,7 +15,6 @@
from tempest import config
from tempest.openstack.common import log as logging
from tempest import test
from tempest.thirdparty.boto import test as boto_test
CONF = config.CONF
@ -40,7 +39,6 @@ class EC2VolumesTest(boto_test.BotoTestCase):
cls.client = cls.os.ec2api_client
cls.zone = CONF.boto.aws_zone
@test.attr(type='smoke')
def test_create_get_delete(self):
# EC2 Create, get, delete Volume
volume = self.client.create_volume(1, self.zone)
@ -53,7 +51,6 @@ class EC2VolumesTest(boto_test.BotoTestCase):
self.client.delete_volume(volume.id)
self.cancelResourceCleanUp(cuk)
@test.attr(type='smoke')
def test_create_volume_from_snapshot(self):
# EC2 Create volume from snapshot
volume = self.client.create_volume(1, self.zone)

1
tempest/thirdparty/boto/test_s3_buckets.py vendored
View File

@ -26,7 +26,6 @@ class S3BucketsTest(boto_test.BotoTestCase):
cls.client = cls.os.s3_client
@test.skip_because(bug="1076965")
@test.attr(type='smoke')
def test_create_and_get_delete_bucket(self):
# S3 Create, get and delete bucket
bucket_name = data_utils.rand_name("s3bucket-")

2
tempest/thirdparty/boto/test_s3_ec2_images.py vendored
View File

@ -17,7 +17,6 @@ import os
from tempest.common.utils import data_utils
from tempest import config
from tempest import test
from tempest.thirdparty.boto import test as boto_test
from tempest.thirdparty.boto.utils import s3
@ -48,7 +47,6 @@ class S3ImagesTest(boto_test.BotoTestCase):
cls.bucket_name)
s3.s3_upload_dir(bucket, cls.materials_path)
@test.attr(type='smoke')
def test_register_get_deregister_ami_image(self):
# Register and deregister ami image
image = {"name": data_utils.rand_name("ami-name-"),

2
tempest/thirdparty/boto/test_s3_objects.py vendored
View File

@ -18,7 +18,6 @@ import contextlib
import boto.s3.key
from tempest.common.utils import data_utils
from tempest import test
from tempest.thirdparty.boto import test as boto_test
@ -29,7 +28,6 @@ class S3BucketsTest(boto_test.BotoTestCase):
super(S3BucketsTest, cls).setUpClass()
cls.client = cls.os.s3_client
@test.attr(type='smoke')
def test_create_get_delete_object(self):
# S3 Create, get and delete object
bucket_name = data_utils.rand_name("s3bucket-")