summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2017-06-13 20:40:26 +0000
committerTim Burke <tim.burke@gmail.com>2017-06-13 21:32:50 +0000
commita8bbdd66464b735a247159ee6c68e0d71bcf27d6 (patch)
tree47983788667e5156725a03eaae86dfdc2ac75f1c
parentde8fe28278905678b84e95fa977aca01545a4b27 (diff)
Blacklist babel==2.4.0 in test-requirements
Sphinx wants babel!=2.0,>=1.3 which drags in 2.4.0, but oslo.i18n (required by keystone) wants Babel!=2.4.0,>=2.3.4 leading to an error when starting keystone. Also, bump up the sleep before verifying that keystone is running -- at just one second, keystone hadn't had a chance to raise the ContextualVersionConflict yet. Further, verify that curl can actually reach keystone on the expected port. Change-Id: I6cbbfd7260571f42ea65c6622aa6b410a0e43b28
Notes
Notes (review): Code-Review+2: Tim Burke <tim@swiftstack.com> Code-Review+1: Karen Chan <karen@karen-chan.com> Code-Review+2: Kota Tsuyuzaki <tsuyuzaki.kota@lab.ntt.co.jp> Workflow+1: Tim Burke <tim@swiftstack.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 16 Jun 2017 17:21:22 +0000 Reviewed-on: https://review.openstack.org/473987 Project: openstack/swift3 Branch: refs/heads/master
-rw-r--r--swift3/test/functional/setup_keystone3
-rw-r--r--test-requirements.txt1
2 files changed, 3 insertions, 1 deletions
diff --git a/swift3/test/functional/setup_keystone b/swift3/test/functional/setup_keystone
index 3f7895f..abc4390 100644
--- a/swift3/test/functional/setup_keystone
+++ b/swift3/test/functional/setup_keystone
@@ -93,8 +93,9 @@ _setup_keystone()
93 > "${log_file}" 2>&1 & 93 > "${log_file}" 2>&1 &
94 export keystone_pid=$! 94 export keystone_pid=$!
95 # make sure it's actually running 95 # make sure it's actually running
96 sleep 1 96 sleep 5
97 ps -p $keystone_pid 97 ps -p $keystone_pid
98 curl -I $OS_AUTH_URL
98 99
99 _create_swift_accounts 100 _create_swift_accounts
100} 101}
diff --git a/test-requirements.txt b/test-requirements.txt
index db7c23c..906b910 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,3 +11,4 @@ requests!=2.12.2,!=2.13.0
11requests-mock>=0.7.0 # Apache-2.0 11requests-mock>=0.7.0 # Apache-2.0
12fixtures<2.0,>=1.3.1 # Apache-2.0/BSD 12fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
13keystonemiddleware 13keystonemiddleware
14babel!=2.4.0