From 23f6363cbd228e6fe01142d860b4408719ca47d0 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Wed, 4 Jan 2017 18:24:54 +0100 Subject: [PATCH] Fix error in functional test 910 The current code for test 910 references self.keystone_sentry this was replaced by an array in commit 4d2ab6668f8601a17bbda1bf89ab7633f22d8d3d. There was probably a race between the commits and functional tests was not run on a updated version of the tree prior to commit 49f993988a1d99a1f31962dd3ba278a4647d8841. After the addition of running keystone clustered in commit 4d2ab6668f8601a17bbda1bf89ab7633f22d8d3d the test in 910 has transient failures. Add call to set_api_version after removal and addition of percona-cluster relation as it will retry and verify authentication accross all nodes making sure that configuration has settled before performing final test. Change-Id: Ib5505adb0ace7c86384bb922008b9a8d73f60f24 --- tests/basic_deployment.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 21fb0297..43171a34 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -804,12 +804,13 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment): u.log.debug('Adding keystone percona-cluster relation') self.d.sentry.wait(timeout=timeout) self.d.relate('keystone:shared-db', 'percona-cluster:shared-db') + self.set_api_version(3) self._auto_wait_for_status( message="Unit is ready", timeout=timeout, include_only=['keystone']) re_auth = u.authenticate_keystone_admin( - self.keystone_sentry, + self.keystone_sentries[0], user='admin', password='openstack', api_version=3,