unskip test_server_connectivity_cold_migration_revert
looks like test passes on at least default non dvr env
try to unskip it for all envs where supported cold_migration
and resize
Related-prod: PRODX-18236
Change-Id: I31d88d2647c8a782661fe89c7202135e5dd28cf8
diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py
index b1919d4..bdf990c 100644
--- a/tempest/scenario/test_network_advanced_server_ops.py
+++ b/tempest/scenario/test_network_advanced_server_ops.py
@@ -262,10 +262,10 @@
self._wait_server_status_and_check_network_connectivity(
server, keypair, floating_ip)
- @decorators.skip_because(bug='1836595')
@decorators.idempotent_id('25b188d7-0183-4b1e-a11d-15840c8e2fd6')
- @testtools.skipUnless(CONF.compute_feature_enabled.cold_migration,
- 'Cold migration is not available.')
+ @testtools.skipIf(not (CONF.compute_feature_enabled.cold_migration and
+ CONF.compute_feature_enabled.resize),
+ 'Cold migration/Resize not available.')
@testtools.skipUnless(CONF.compute.min_compute_nodes > 1,
'Less than 2 compute nodes, skipping multinode '
'tests.')