From ebb01ddaabe91126bbea7cff03a83e30feaf7241 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Sat, 19 Nov 2016 02:09:08 +0000 Subject: [PATCH] Unpin python-openstackclient in test-requirements.txt ...because the alternative is to add pins for one or more of * osc-lib * os-client-config * cliff * whatever else... Also drop the unused OS_* env vars, as they make more-recent python-openstackclient barf with TypeError: __init__() got an unexpected keyword argument 'project_name' Change-Id: Ibfda43cfc28b5aa6530d4ab3a87a7bc696b9ca7c --- swift3/test/functional/setup_keystone | 5 ----- test-requirements.txt | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/swift3/test/functional/setup_keystone b/swift3/test/functional/setup_keystone index cdfb4674..8e5f5465 100644 --- a/swift3/test/functional/setup_keystone +++ b/swift3/test/functional/setup_keystone @@ -15,11 +15,6 @@ set -e -export OS_AUTH_URL=http://localhost:35357/v2.0 -export OS_TENANT_NAME=admin -export OS_USERNAME=admin -export OS_PASSWORD=password - export OS_TOKEN=ADMIN export OS_URL=http://localhost:35357/v2.0 diff --git a/test-requirements.txt b/test-requirements.txt index e8e2d41a..61740be0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ openstack.nose_plugin coverage mock pylint -python-openstackclient<=1.9.0 +python-openstackclient boto requests-mock>=0.7.0 # Apache-2.0 fixtures<2.0,>=1.3.1 # Apache-2.0/BSD