openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Define custom groups for fuel master migration test"

This commit is contained in:
Jenkins 2015-11-25 14:48:05 +00:00 committed by Gerrit Code Review
parent f04c277064 caecd4052b
commit 37c05e38a6
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuelweb_test/run_tests.py
View File

@ -33,7 +33,11 @@ def define_custom_groups():
"system_test.failover.destroy_controllers."
"first.3ctrl_2comp_1cndr_neutronVLAN",
"system_test.failover.destroy_controllers."
"second.1ctrl_ceph_2ctrl_1comp_1comp_ceph_neutronVLAN"]}
"second.1ctrl_ceph_2ctrl_1comp_1comp_ceph_neutronVLAN"]},
{"groups": ["system_test.fuel_master_migrate"],
"depends": [
"system_test.fuel_migration.1ctrl_1comp_neutronVLAN",
"system_test.fuel_migration.1ctrl_1comp_neutronTUN"]}
]
for new_group in groups_list:

6
fuelweb_test/tests/test_admin_node.py
View File

@ -446,11 +446,13 @@ class TestLogrotateBase(TestBasic):
self.env.make_snapshot("test_logrotate_one_week_11MB")
@test(groups=["fuel_master_migrate"])
@test(enabled=False,
groups=["fuel_master_migrate"])
class FuelMasterMigrate(TestBasic):
"""FuelMasterMigrate.""" # TODO documentation
@test(depends_on=[SetupEnvironment.prepare_slaves_3],
@test(enabled=False,
depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["fuel_migration"])
@log_snapshot_after_test
def fuel_migration(self):