From 91713886a672b939214e41c62a391e3ce58036e0 Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Thu, 27 Apr 2017 11:26:26 -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: I8dbbc66b2aaaee90c6565eea1fafb324f3e51734
---
 test-requirements.txt | 4 ++++
 tox.ini               | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/test-requirements.txt b/test-requirements.txt
index 04ca6238..9edd4bbf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,9 +15,13 @@ 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/tox.ini b/tox.ini
index 1610be31..7c2936e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,6 +21,11 @@ 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