From 89c8319b9b463bc70c0467868dc209b6e3276e20 Mon Sep 17 00:00:00 2001 From: asledzinskiy Date: Thu, 22 Dec 2016 13:52:03 +0200 Subject: [PATCH] Remove custom timeouts in few_os tests - We have default timeout for deployment bigger than we used in few_os tests so it's better to stick to default Change-Id: I58f04ee23a10c32053087832b843372a0a1a5150 --- fuel_ccp_tests/tests/system/test_few_os.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fuel_ccp_tests/tests/system/test_few_os.py b/fuel_ccp_tests/tests/system/test_few_os.py index f3274c2..dc4a02b 100644 --- a/fuel_ccp_tests/tests/system/test_few_os.py +++ b/fuel_ccp_tests/tests/system/test_few_os.py @@ -62,7 +62,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest): underlay.sudo_check_call("pip install python-openstackclient", host=config.k8s.kube_host) ccpcluster.deploy(params={"config-file": "./config_1.yaml"}) - post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000) + post_os_deploy_checks.check_jobs_status(k8s_actions.api) post_os_deploy_checks.check_pods_status(k8s_actions.api) remote.check_call( "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" @@ -83,7 +83,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest): '/tmp/1ctrl_1comp_diff.yaml']) ccpcluster.deploy(params={"config-file": "./config_2.yaml"}) - post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000, + post_os_deploy_checks.check_jobs_status(k8s_actions.api, namespace="ccp-second") post_os_deploy_checks.check_pods_status(k8s_actions.api, namespace="ccp-second") @@ -130,7 +130,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest): underlay.sudo_check_call("pip install python-openstackclient", host=config.k8s.kube_host) ccpcluster.deploy(params={"config-file": "./config_1.yaml"}) - post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000) + post_os_deploy_checks.check_jobs_status(k8s_actions.api) post_os_deploy_checks.check_pods_status(k8s_actions.api) remote.check_call( "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" @@ -151,7 +151,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest): '/tmp/1ctrl_1comp_same.yaml']) ccpcluster.deploy(params={"config-file": "./config_2.yaml"}) - post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000, + post_os_deploy_checks.check_jobs_status(k8s_actions.api, namespace="ccp-second") post_os_deploy_checks.check_pods_status(k8s_actions.api, namespace="ccp-second") @@ -199,7 +199,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest): underlay.sudo_check_call("pip install python-openstackclient", host=config.k8s.kube_host) ccpcluster.deploy(params={"config-file": "./config_1.yaml"}) - post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000) + post_os_deploy_checks.check_jobs_status(k8s_actions.api) post_os_deploy_checks.check_pods_status(k8s_actions.api) remote.check_call( "source openrc-{}; openstack flavor create" @@ -217,7 +217,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest): '/tmp/1ctrl.yaml']) ccpcluster.deploy(params={"config-file": "./config_2.yaml"}) - post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000, + post_os_deploy_checks.check_jobs_status(k8s_actions.api, namespace="ccp-second") post_os_deploy_checks.check_pods_status(k8s_actions.api, namespace="ccp-second") @@ -234,7 +234,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest): settings.CCP_SOURCES_CONFIG, '/tmp/1ctrl.yaml']) ccpcluster.deploy(params={"config-file": "./config_3.yaml"}) - post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000, + post_os_deploy_checks.check_jobs_status(k8s_actions.api, namespace="ccp-third") post_os_deploy_checks.check_pods_status(k8s_actions.api, namespace="ccp-third")