diff --git a/murano_tempest_tests/tests/functional/integration/test_mistral.py b/murano_tempest_tests/tests/functional/integration/test_mistral.py index b855a25..46fbc8d 100644 --- a/murano_tempest_tests/tests/functional/integration/test_mistral.py +++ b/murano_tempest_tests/tests/functional/integration/test_mistral.py @@ -14,12 +14,12 @@ import uuid -from nose.plugins.attrib import attr as tag - import murano_tempest_tests.tests.functional.common.utils as common_utils import murano_tempest_tests.tests.functional.integration.integration_base \ as core +from tempest.lib import decorators + class MistralTest(core.MistralIntegration): @@ -42,7 +42,7 @@ class MistralTest(core.MistralIntegration): with common_utils.ignored(Exception): cls.purge_uploaded_packages() - @tag('all', 'coverage') + @decorators.attr(type=['all', 'coverage']) def test_deploy_package_success(self): # Test expects successful deployment and one output: input_1_value. diff --git a/murano_tempest_tests/tests/functional/integration/test_policy_enf.py b/murano_tempest_tests/tests/functional/integration/test_policy_enf.py index dbcfde4..493cd8f 100644 --- a/murano_tempest_tests/tests/functional/integration/test_policy_enf.py +++ b/murano_tempest_tests/tests/functional/integration/test_policy_enf.py @@ -13,12 +13,13 @@ # under the License. import muranoclient.common.exceptions as murano_exceptions -from nose.plugins.attrib import attr as tag import murano_tempest_tests.tests.functional.common.utils as common_utils import murano_tempest_tests.tests.functional.integration.integration_base \ as core +from tempest.lib import decorators + class PolicyEnforcementTest(core.CongressIntegration): @@ -40,7 +41,7 @@ class PolicyEnforcementTest(core.CongressIntegration): super(PolicyEnforcementTest, self).tearDown() self.purge_environments() - @tag('all', 'coverage') + @decorators.attr(type=['all', 'coverage']) def test_deploy_policy_fail_key(self): """Test expects failure due to empty key name. @@ -55,7 +56,7 @@ class PolicyEnforcementTest(core.CongressIntegration): flavor='m1.small'), 'missing key') - @tag('all', 'coverage') + @decorators.attr(type=['all', 'coverage']) def test_deploy_policy_fail_flavor(self): """Test expects failure due to blacklisted flavor @@ -69,7 +70,7 @@ class PolicyEnforcementTest(core.CongressIntegration): key='test-key'), 'bad flavor') - @tag('all', 'coverage') + @decorators.attr(type=['all', 'coverage']) def test_set_property_policy(self): """Tests environment modification by policy diff --git a/requirements.txt b/requirements.txt index 662777d..21d35d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,6 @@ oslo.utils>=3.33.0 # Apache-2.0 testtools>=2.2.0 # MIT tempest>=17.1.0 # Apache-2.0 requests>=2.14.2 # Apache-2.0 -nose>=1.3.7 # LGPL testresources>=2.0.0 # Apache-2.0/BSD python-keystoneclient>=3.8.0 # Apache-2.0