openstack/manila
Code Issues Proposed changes

Merge "Fix scenario tests"

Browse Source
This commit is contained in:
Jenkins 2016-03-14 18:33:49 +00:00 committed by Gerrit Code Review
commit 1e069a74e8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/ci/post_test_hook.sh
View File

@ -236,7 +236,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"

6
manila_tempest_tests/tests/scenario/test_share_basic_ops.py
View File

@ -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)
if utils.is_microversion_lt(CONF.share.max_api_microversion, "2.9"):
@ -197,7 +198,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)
if utils.is_microversion_lt(CONF.share.max_api_microversion, "2.9"):