Merge lp:~bac/charmworld/timeout-values into lp:~juju-jitsu/charmworld/trunk

[Brad Crittenden]

Change timeout units for calls to ElasticSearch 'health' to match documentation. Also silence openid messages.

For health queries it *appears* that ES wants a string representing the timeout value with a unit, i.e. '30s' rather than an integer specifying the number of milliseconds.

See the 'health' entry at http://pyelasticsearch.readthedocs.org/en/latest/api/#module-pyelasticsearch
and follow the link below it to the native ES documentation.

This branch also silences openid messages spewed during testing.

[lp:~bac/charmworld/timeout-values]

381. By Brad Crittenden on 2013-09-04

Merge from trunk

[Benji York (benji)]

Looks good. I agree with your reading of the timeout docs.

review: Approve

=== modified file 'charmworld/search.py'
--- charmworld/search.py	2013-09-04 10:26:28 +0000
+++ charmworld/search.py	2013-09-04 13:38:23 +0000
@@ -121,7 +121,7 @@
     def __init__(self, client, index_name):
         self._client = client
         self.index_name = index_name
-        self.stable_status_timeout = 30000
+        self.stable_status_timeout = '30s'
 
     def exists(self):
         try:

=== modified file 'charmworld/tests/test_search.py'
--- charmworld/tests/test_search.py	2013-09-04 13:17:21 +0000
+++ charmworld/tests/test_search.py	2013-09-04 13:38:23 +0000
@@ -721,7 +721,7 @@
     def test_put_mapping_missing_index(self):
         # The error we get from a missing index is IndexMissing
         client = ElasticSearchClient.from_settings(get_ini(), 'temp-index')
-        client.stable_status_timeout = 500
+        client.stable_status_timeout = '0.5s'
         with self.assertRaises(IndexMissing):
             client.put_mapping()
 
@@ -993,7 +993,7 @@
     def test_update_no_index(self):
         index_client = ElasticSearchClient.from_settings(
             get_ini(), 'temp-index')
-        index_client.stable_status_timeout = 500
+        index_client.stable_status_timeout = '0.5s'
         actual_client = update(index_client)
         self.addCleanup(actual_client.delete_index)
         self.assertEqual([actual_client.index_name],

=== modified file 'charmworld/views/tests/test_auth.py'
--- charmworld/views/tests/test_auth.py	2013-09-03 20:22:22 +0000
+++ charmworld/views/tests/test_auth.py	2013-09-04 13:38:23 +0000
@@ -1,11 +1,16 @@
 # Copyright 2012, 2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+import openid.oidutil
+
 from charmworld.testing import factory
 from charmworld.testing import login_request
 from charmworld.testing import WebTestBase
 
 
+openid.oidutil.log = lambda message, level=0: None
+
+
 class TestAuthViews(WebTestBase):
 
     def test_post_auth(self):