From baf2d803e2e1c26e6fdb3de350546eb60d36c53a Mon Sep 17 00:00:00 2001 From: Dmitry_Eremeev Date: Wed, 12 Feb 2020 17:14:41 +0300 Subject: [PATCH] Cancel skipping tests "test_register_get_deregister_ami_image" and "test_run_and_ping_registered_image" Change-Id: Ibe564b0edb64eaf2240f077f4adf042689ed6057 --- ec2api_tempest_plugin/api/test_images.py | 5 ----- ec2api_tempest_plugin/scenario/test_instances.py | 7 ++----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ec2api_tempest_plugin/api/test_images.py b/ec2api_tempest_plugin/api/test_images.py index 1c33ed2..0e9e718 100644 --- a/ec2api_tempest_plugin/api/test_images.py +++ b/ec2api_tempest_plugin/api/test_images.py @@ -336,11 +336,6 @@ class ImageRegisterTest(base.EC2TestCase): raise cls.skipException('Image materials are not ready in S3') @decorators.idempotent_id('3e25269d-c8a2-4438-ab25-c343cb53db79') - @testtools.skip( - "Temporarily skipped to merge fix" - " encoding/decoding in paging of" - " universal describer class" - ) def test_register_get_deregister_ami_image(self): image_name = data_utils.rand_name("ami-name") data = self.client.register_image( diff --git a/ec2api_tempest_plugin/scenario/test_instances.py b/ec2api_tempest_plugin/scenario/test_instances.py index b15da1a..5c3ee3e 100644 --- a/ec2api_tempest_plugin/scenario/test_instances.py +++ b/ec2api_tempest_plugin/scenario/test_instances.py @@ -142,11 +142,8 @@ class InstancesTest(scenario_base.BaseScenarioTest): waiter.wait_no_exception() @decorators.idempotent_id('df1bb8f2-193c-46ba-aa99-3981bbc367db') - @testtools.skip( - "Temporarily skipped to merge fix" - " encoding/decoding in paging of" - " universal describer class" - ) + @testtools.skipUnless(CONF.aws.run_ssh, 'SSH tests are disabled.') + @testtools.skipUnless(CONF.aws.ami_image_location, "Image is absent in S3") def test_run_and_ping_registered_image(self): image_name = data_utils.rand_name("ami-name") data = self.client.register_image(