diff options
author | BinBin Cong <binbin.cong@easystack.cn> | 2016-05-07 02:43:02 -0400 |
---|---|---|
committer | BinBin Cong <binbin.cong@easystack.cn> | 2016-05-08 23:19:08 -0400 |
commit | 10d5af250b60c2e161851d75d0055c0d7368ddfc (patch) | |
tree | ea5d3c632bf5952e717d6b1fc1b6ddaf32164942 /tempest/api/compute/admin/test_servers_on_multinodes.py | |
parent | 8d468c8332b1d0d7176c285de4cedfa589a54a23 (diff) | |
download | tempest-10d5af250b60c2e161851d75d0055c0d7368ddfc.tar.gz |
Skip multinodes testing if no same/different scheduler filter enabled
If no SameHostFilter/DifferentHostFilter enabled in test environment,
multinodes testing with same/different scheduler hints testings should
not be executed
Change-Id: I57e5ff4641ff27ed3d0b9a67dbe014921e356583
Diffstat (limited to 'tempest/api/compute/admin/test_servers_on_multinodes.py')
-rw-r--r-- | tempest/api/compute/admin/test_servers_on_multinodes.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tempest/api/compute/admin/test_servers_on_multinodes.py b/tempest/api/compute/admin/test_servers_on_multinodes.py index 814a876aa..1bbde986c 100644 --- a/tempest/api/compute/admin/test_servers_on_multinodes.py +++ b/tempest/api/compute/admin/test_servers_on_multinodes.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +import testtools + from tempest.api.compute import base from tempest import config from tempest import test @@ -34,6 +36,9 @@ class ServersOnMultiNodesTest(base.BaseV2ComputeAdminTest): server_id)['server']['OS-EXT-SRV-ATTR:host'] @test.idempotent_id('26a9d5df-6890-45f2-abc4-a659290cb130') + @testtools.skipUnless( + test.is_scheduler_filter_enabled("SameHostFilter"), + 'SameHostFilter is not available.') def test_create_servers_on_same_host(self): server01 = self.create_test_server(wait_until='ACTIVE')['id'] @@ -45,6 +50,9 @@ class ServersOnMultiNodesTest(base.BaseV2ComputeAdminTest): self.assertEqual(host01, host02) @test.idempotent_id('cc7ca884-6e3e-42a3-a92f-c522fcf25e8e') + @testtools.skipUnless( + test.is_scheduler_filter_enabled("DifferentHostFilter"), + 'DifferentHostFilter is not available.') def test_create_servers_on_different_hosts(self): server01 = self.create_test_server(wait_until='ACTIVE')['id'] @@ -56,6 +64,9 @@ class ServersOnMultiNodesTest(base.BaseV2ComputeAdminTest): self.assertNotEqual(host01, host02) @test.idempotent_id('7869cc84-d661-4e14-9f00-c18cdc89cf57') + @testtools.skipUnless( + test.is_scheduler_filter_enabled("DifferentHostFilter"), + 'DifferentHostFilter is not available.') def test_create_servers_on_different_hosts_with_list_of_servers(self): server01 = self.create_test_server(wait_until='ACTIVE')['id'] |