From a7baed8c94031efde21e431521e5f01a91eee75c Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Thu, 27 Apr 2017 11:18:31 -0700
Subject: [PATCH] Enable Zesty-Ocata Amulet Tests

- Turn on Zesty-Ocata Amulet test definitions.
- Standardize test-requirements.txt
- Sync charm helpers for various fixes

Change-Id: Ia86ed2cf9557d9eb11f577d641eb3e6920ff9e3e
---
 requirements.txt             |  1 -
 test-requirements.txt        | 18 +++++++++++-------
 tests/gate-basic-zesty-ocata |  0
 tox.ini                      |  7 ++++++-
 4 files changed, 17 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 tests/gate-basic-zesty-ocata

diff --git a/requirements.txt b/requirements.txt
index 0c902746..6a3271b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,4 +10,3 @@ Jinja2>=2.6  # BSD License (3 clause)
 six>=1.9.0
 dnspython>=1.12.0
 psutil>=1.1.1,<2.0.0
-python-keystoneclient>=1.6.0,!=1.8.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 06972943..9edd4bbf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,13 +11,17 @@ requests==2.6.0
 # Liberty client lower constraints
 amulet>=1.14.3,<2.0
 bundletester>=0.6.1,<1.0
-python-ceilometerclient>=1.5.0,<2.0
-python-cinderclient>=1.4.0,<2.0
-python-glanceclient>=1.1.0,<2.0
-python-heatclient>=0.8.0,<1.0
-python-novaclient>=2.30.1,<3.0
-python-openstackclient>=1.7.0,<2.0
-python-swiftclient>=2.6.0,<3.0
+python-ceilometerclient>=1.5.0
+python-cinderclient>=1.4.0
+python-glanceclient>=1.1.0
+python-heatclient>=0.8.0
+python-keystoneclient>=1.7.1
+python-neutronclient>=3.1.0
+python-novaclient>=2.30.1
+python-openstackclient>=1.7.0
+python-swiftclient>=2.6.0
 pika>=0.10.0,<1.0
 distro-info
 # END: Amulet OpenStack Charm Helper Requirements
+# NOTE: workaround for 14.04 pip/tox
+pytz
diff --git a/tests/gate-basic-zesty-ocata b/tests/gate-basic-zesty-ocata
old mode 100644
new mode 100755
diff --git a/tox.ini b/tox.ini
index 1463d531..7c2936e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,13 +14,18 @@ install_command =
   pip install --allow-unverified python-apt {opts} {packages}
 commands = ostestr {posargs}
 whitelist_externals = juju
-passenv = HOME TERM AMULET_* CS_API_URL
+passenv = HOME TERM AMULET_* CS_API_*
 
 [testenv:py27]
 basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
+[testenv:py35]
+basepython = python3.5
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:pep8]
 basepython = python2.7
 deps = -r{toxinidir}/requirements.txt