Enable Zesty-Ocata Amulet Tests

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

Change-Id: I4c227c9b93ddfb5802b00dd0e74c8724f3468121

src/test-requirements.txt

@@ -1,21 +1,32 @@
-# charm-proof
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+coverage>=3.6
+mock>=1.2
+flake8>=2.2.4,<=2.4.1
+os-testr>=0.4.1
 charm-tools>=2.0.0
+requests==2.6.0
 # amulet deployment helpers
 bzr+lp:charm-helpers#egg=charmhelpers
 # BEGIN: Amulet OpenStack Charm Helper Requirements
 # Liberty client lower constraints
 amulet>=1.14.3,<2.0
 bundletester>=0.6.1,<1.0
-python-keystoneclient>=1.7.1,<2.0
+aodhclient>=0.1.0
-python-barbicanclient>=4.0.1,<5.0
+python-barbicanclient>=4.0.1
-python-designateclient>=1.5,<2.0
+python-ceilometerclient>=1.5.0
-python-cinderclient>=1.4.0,<2.0
+python-cinderclient>=1.4.0
-python-glanceclient>=1.1.0,<2.0
+python-designateclient>=1.5
-python-heatclient>=0.8.0,<1.0
+python-glanceclient>=1.1.0
-python-neutronclient>=3.1.0,<4.0
+python-heatclient>=0.8.0
-python-novaclient>=2.30.1,<3.0
+python-keystoneclient>=1.7.1
-python-openstackclient>=1.7.0,<2.0
+python-neutronclient>=3.1.0
-python-swiftclient>=2.6.0,<3.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

src/tox.ini

@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          AMULET_SETUP_TIMEOUT=2700
 whitelist_externals = juju
-passenv = HOME TERM AMULET_*
+passenv = HOME TERM AMULET_* CS_API_URL
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
   pip install --allow-unverified python-apt {opts} {packages}