Update requirements, fix testsuite

Manually update from global requirements.
Remove obsolete docutils pin.
Regenerate climate config file.
Fix testsuite for testtools change.
Workaround PYTHONHASHSEED setting in tox, disable for now so that tests
always pass.

Change-Id: I8c4a458371b28c91c5b848094e56038a16d6afc3

climate/tests/test_context.py

@@ -45,7 +45,7 @@ class TestBaseContext(tests.TestCase):
         super(TestBaseContext, self).setUp()
         self.context = TestContext(first=1, second=2)
 
-    def test_get_defined(self):
+    def tearDown(self):
         super(TestBaseContext, self).tearDown()
         self.assertEqual(self.context.first, 1)
 

etc/climate/climate.conf.sample

@@ -14,10 +14,6 @@
 # Size of RPC connection pool. (integer value)
 #rpc_conn_pool_size=30
 
-# Modules of exceptions that are permitted to be recreated
-# upon receiving exception data from an rpc call. (list value)
-#allowed_rpc_exception_modules=oslo.messaging.exceptions,nova.exception,cinder.exception,exceptions
-
 # Qpid broker hostname. (string value)
 #qpid_hostname=localhost
 
@@ -156,15 +152,6 @@
 # Heartbeat time-to-live. (integer value)
 #matchmaker_heartbeat_ttl=600
 
-# Host to locate redis. (string value)
-#host=127.0.0.1
-
-# Use this port to connect to redis host. (integer value)
-#port=6379
-
-# Password for Redis server (optional). (string value)
-#password=<None>
-
 # Size of RPC greenthread pool. (integer value)
 #rpc_thread_pool_size=64
 
@@ -740,6 +727,22 @@
 #notify_hours_before_lease_end=48
 
 
+[matchmaker_redis]
+
+#
+# Options defined in oslo.messaging
+#
+
+# Host to locate redis. (string value)
+#host=127.0.0.1
+
+# Use this port to connect to redis host. (integer value)
+#port=6379
+
+# Password for Redis server (optional). (string value)
+#password=<None>
+
+
 [matchmaker_ring]
 
 #

requirements.txt

@@ -1,20 +1,20 @@
 pbr>=0.6,!=0.7,<1.0
 
-alembic>=0.6.2
+alembic>=0.6.4
 Babel>=1.3
 eventlet>=0.13.0
 Flask>=0.10,<1.0
 iso8601>=0.1.9
 kombu>=2.4.8
-oslo.config>=1.2.1
-oslo.messaging>=1.3.0
+oslo.config>=1.4.0.0a3
+oslo.messaging>=1.4.0.0a3
 posix_ipc
 python-novaclient>=2.17.0
 netaddr>=0.7.6
-python-keystoneclient>=0.9.0
-pecan>=0.4.5
+python-keystoneclient>=0.10.0
+pecan>=0.5.0
 Routes>=1.12.3,!=2.0
-SQLAlchemy>=0.8.4,!=0.9.5,<=0.9.99
+SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
 stevedore>=0.14
 WebOb>=1.2.3
 WSME>=0.6

test-requirements.txt

@@ -1,6 +1,5 @@
 hacking>=0.8.0,<0.9
 
-docutils==0.9.1
 nose
 mock>=1.0
 mox>=0.5.3

tox.ini

@@ -10,6 +10,7 @@ deps = -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/requirements.txt
 setenv = VIRTUAL_ENV={envdir}
          DISCOVER_DIRECTORY=climate/tests
+         PYTHONHASHSEED=0
 commands =
     python -m climate.openstack.common.lockutils python setup.py testr --slowest --testr-args="{posargs}"