openstack/fuel-main
Code Issues Proposed changes

Merge "Increase timeout waiting upgrade is done"

Browse Source
This commit is contained in:
Jenkins 2014-07-30 05:36:38 +00:00 committed by Gerrit Code Review
commit 60669ce22d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuelweb_test/tests/test_upgrade.py
View File

@ -58,7 +58,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
checkers.run_script(self.env.get_admin_remote(), '/var', 'upgrade.sh')
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 1500,
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 3000,
phrase='*** UPGRADE DONE SUCCESSFULLY')
checkers.check_upgraded_containers(self.env.get_admin_remote(),
hlp_data.UPGRADE_FUEL_FROM,
@ -112,7 +112,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
checkers.run_script(self.env.get_admin_remote(), '/var', 'upgrade.sh')
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 1500,
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 3000,
phrase='*** UPGRADE DONE SUCCESSFULLY')
checkers.check_upgraded_containers(self.env.get_admin_remote(),
hlp_data.UPGRADE_FUEL_FROM,
@ -188,7 +188,7 @@ class UpgradeFuelMaster(base_test_data.TestBasic):
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
checkers.run_script(self.env.get_admin_remote(), '/var', 'upgrade.sh')
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 1500,
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 3000,
phrase='*** UPGRADE DONE SUCCESSFULLY')
checkers.check_upgraded_containers(self.env.get_admin_remote(),
hlp_data.UPGRADE_FUEL_FROM,
@ -263,7 +263,7 @@ class RollbackFuelMaster(base_test_data.TestBasic):
os.path.basename(hlp_data.
UPGRADE_TARBALL_PATH), '/var')
checkers.run_script(self.env.get_admin_remote(), '/var', 'upgrade.sh')
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 1500,
checkers.wait_upgrade_is_done(self.env.get_admin_remote(), 3000,
phrase='*** UPGRADE DONE SUCCESSFULLY')
checkers.check_upgraded_containers(self.env.get_admin_remote(),
hlp_data.UPGRADE_FUEL_FROM,
@ -323,7 +323,7 @@ class RollbackFuelMaster(base_test_data.TestBasic):
'docker_engine.py')
checkers.run_with_rollback(self.env.get_admin_remote(),
'/var', 'upgrade.sh')
checkers.wait_rollback_is_done(self.env.get_admin_remote(), 1500)
checkers.wait_rollback_is_done(self.env.get_admin_remote(), 3000)
checkers.check_upgraded_containers(self.env.get_admin_remote(),
hlp_data.UPGRADE_FUEL_TO,
hlp_data.UPGRADE_FUEL_FROM)