Merge lp:~reedobrien/charmworld/027test-fails into lp:charmworld

[Reed O'Brien]

Call wait_for_green_status() which will hopefully allow the test to pass on slower HW.

This will hopefully make the test pass on qa.

[Reed O'Brien (reedobrien)]

one line change LGTM

review: Approve

[Juju Gui Bot (juju-gui-bot)]

review: Approve (continuous-integration)

=== modified file 'charmworld/migrations/versions/tests/test_migrations.py'
--- charmworld/migrations/versions/tests/test_migrations.py	2014-05-21 00:49:10 +0000
+++ charmworld/migrations/versions/tests/test_migrations.py	2014-05-21 16:17:21 +0000
@@ -161,6 +161,7 @@
         self.index_client.delete_index()
         # Create an empty index.
         self.index_client._client.create_index(self.index_client.index_name)
+        self.index_client.wait_for_green_status()
         # Put up the old mappings.
         for type_ in ('charm', 'bundle'):
             self.index_client._client.put_mapping(
@@ -183,14 +184,10 @@
         self.assertEquals(self.data_store.current_version, self.version)
         self.assertTrue(self.exists_in_index(charm['_id']))
 
-    # XXX: BradCrittenden 2014-05-20: On Jenkins this test is failing, likely
-    # due to an ill-configured ElasticSearch on the freshly minted
-    # environment.  Skipping.
     def test_exception_raised(self):
         """Putting new mapping without creating the filter and analyzer
         raises the expected exception.
         """
-        self.skipTest("Fails on Jenkins.  See kanban card.")
         self.versions.ensure_initialized(self.data_store, True)
         ## Pretend upgrades through 26 are complete.
         self.data_store.update_version(26)