diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-28 21:29:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-28 21:29:36 +0000 |
| commit | a25df11b572df08de73f2a365bfb41c1cfaec2eb (patch) | |
| tree | 983c6c900433cdbcfe7a1053422d7237f22e902d | |
| parent | f0e1d8b1b24319d27ad2ee293176ab7ea1937556 (diff) | |
| parent | 5e1bcd90810cd31cb9dff095d2be244e09f2d0ed (diff) | |
| download | tempest-a25df11b572df08de73f2a365bfb41c1cfaec2eb.tar.gz | |
Merge "remove gate tag (part 3)"
| -rw-r--r-- | tempest/test.py | 6 | ||||
| -rw-r--r-- | tempest/tests/test_decorators.py | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/tempest/test.py b/tempest/test.py index d57b1d832..1ee067366 100644 --- a/tempest/test.py +++ b/tempest/test.py @@ -52,13 +52,9 @@ def attr(*args, **kwargs): def decorator(f): if 'type' in kwargs and isinstance(kwargs['type'], str): f = testtools.testcase.attr(kwargs['type'])(f) - if kwargs['type'] == 'smoke': - f = testtools.testcase.attr('gate')(f) elif 'type' in kwargs and isinstance(kwargs['type'], list): for attr in kwargs['type']: f = testtools.testcase.attr(attr)(f) - if attr == 'smoke': - f = testtools.testcase.attr('gate')(f) return f return decorator @@ -665,7 +661,7 @@ def SimpleNegativeAutoTest(klass): """ This decorator registers a test function on basis of the class name. """ - @attr(type=['negative', 'gate']) + @attr(type=['negative']) def generic_test(self): if hasattr(self, '_schema'): self.execute(self._schema) diff --git a/tempest/tests/test_decorators.py b/tempest/tests/test_decorators.py index 0cd54b99b..e5f51f24b 100644 --- a/tempest/tests/test_decorators.py +++ b/tempest/tests/test_decorators.py @@ -49,13 +49,9 @@ class TestAttrDecorator(BaseDecoratorsTest): def test_attr_without_type(self): self._test_attr_helper(expected_attrs='baz', bar='baz') - def test_attr_decorator_with_smoke_type(self): - # smoke passed as type, so smoke and gate must have been set. - self._test_attr_helper(expected_attrs=['smoke', 'gate'], type='smoke') - def test_attr_decorator_with_list_type(self): - # if type is 'smoke' we'll get the original list of types plus 'gate' - self._test_attr_helper(expected_attrs=['smoke', 'foo', 'gate'], + # if type is 'smoke' we'll get the original list of types + self._test_attr_helper(expected_attrs=['smoke', 'foo'], type=['smoke', 'foo']) def test_attr_decorator_with_unknown_type(self): |