From 08e3e61de565d314013bb34777bb87974a761c28 Mon Sep 17 00:00:00 2001 From: Marc Koderer Date: Mon, 15 Feb 2016 17:37:13 +0100 Subject: [PATCH] Fix scenario tests Fix several issues in scenario test to get them stable again: - The SSH timeout was set to 80 seconds what is way too low for an Nova instance to come up in the gate. - Scenario test access rule cleanup is not necessary, access rules are deleted when share instance is deleted. Co-Authored-By: Rodrigo Barbieri Closes-bug #1545715 Change-Id: I9f22f0416bb248666fe906e1ca653517054f21b5 --- contrib/ci/post_test_hook.sh | 1 - manila_tempest_tests/tests/scenario/test_share_basic_ops.py | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index 64c8836c..3b614601 100755 --- a/contrib/ci/post_test_hook.sh +++ b/contrib/ci/post_test_hook.sh @@ -191,7 +191,6 @@ iniset $TEMPEST_CONFIG identity alt_username ${ALT_USERNAME:-"alt_demo"} iniset $TEMPEST_CONFIG identity alt_password $ADMIN_PASSWORD iniset $TEMPEST_CONFIG identity alt_tenant_name ${ALT_TENANT_NAME:-"alt_demo"} iniset $TEMPEST_CONFIG validation ip_version_for_ssh 4 -iniset $TEMPEST_CONFIG validation ssh_timeout $BUILD_TIMEOUT iniset $TEMPEST_CONFIG validation network_for_ssh ${PRIVATE_NETWORK_NAME:-"private"} echo "Running tempest manila test suites" diff --git a/manila_tempest_tests/tests/scenario/test_share_basic_ops.py b/manila_tempest_tests/tests/scenario/test_share_basic_ops.py index fe667877..4b1daf48 100644 --- a/manila_tempest_tests/tests/scenario/test_share_basic_ops.py +++ b/manila_tempest_tests/tests/scenario/test_share_basic_ops.py @@ -173,7 +173,8 @@ class ShareBasicOpsBase(manager.ShareScenarioTest): self.security_group = self._create_security_group() self.create_share() instance = self.boot_instance() - self.allow_access_ip(self.share['id'], instance=instance) + self.allow_access_ip(self.share['id'], instance=instance, + cleanup=False) ssh_client = self.init_ssh(instance) for location in self.share['export_locations']: self.mount_share(location, ssh_client) @@ -189,7 +190,8 @@ class ShareBasicOpsBase(manager.ShareScenarioTest): # boot first VM and write data instance1 = self.boot_instance() - self.allow_access_ip(self.share['id'], instance=instance1) + self.allow_access_ip(self.share['id'], instance=instance1, + cleanup=False) ssh_client_inst1 = self.init_ssh(instance1) # TODO(vponomaryov): use separate API for getting export location for