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

Proposed by Reed O'Brien
Status: Merged
Approved by: Reed O'Brien
Approved revision: 515
Merged at revision: 515
Proposed branch: lp:~reedobrien/charmworld/027test-fails
Merge into: lp:charmworld
Diff against target: 26 lines (+1/-4)
1 file modified
charmworld/migrations/versions/tests/ (+1/-4)
To merge this branch: bzr merge lp:~reedobrien/charmworld/027test-fails
Reviewer Review Type Date Requested Status
Juju Gui Bot continuous-integration Approve
Reed O'Brien (community) Approve
Review via email:

Commit message

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

Description of the change

This will hopefully make the test pass on qa.

To post a comment you must log in.
Revision history for this message
Reed O'Brien (reedobrien) wrote :

one line change LGTM

review: Approve
Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'charmworld/migrations/versions/tests/'
--- charmworld/migrations/versions/tests/ 2014-05-21 00:49:10 +0000
+++ charmworld/migrations/versions/tests/ 2014-05-21 16:17:21 +0000
@@ -161,6 +161,7 @@
161 self.index_client.delete_index()161 self.index_client.delete_index()
162 # Create an empty index.162 # Create an empty index.
163 self.index_client._client.create_index(self.index_client.index_name)163 self.index_client._client.create_index(self.index_client.index_name)
164 self.index_client.wait_for_green_status()
164 # Put up the old mappings.165 # Put up the old mappings.
165 for type_ in ('charm', 'bundle'):166 for type_ in ('charm', 'bundle'):
166 self.index_client._client.put_mapping(167 self.index_client._client.put_mapping(
@@ -183,14 +184,10 @@
183 self.assertEquals(self.data_store.current_version, self.version)184 self.assertEquals(self.data_store.current_version, self.version)
184 self.assertTrue(self.exists_in_index(charm['_id']))185 self.assertTrue(self.exists_in_index(charm['_id']))
186 # XXX: BradCrittenden 2014-05-20: On Jenkins this test is failing, likely
187 # due to an ill-configured ElasticSearch on the freshly minted
188 # environment. Skipping.
189 def test_exception_raised(self):187 def test_exception_raised(self):
190 """Putting new mapping without creating the filter and analyzer188 """Putting new mapping without creating the filter and analyzer
191 raises the expected exception.189 raises the expected exception.
192 """190 """
193 self.skipTest("Fails on Jenkins. See kanban card.")
194 self.versions.ensure_initialized(self.data_store, True)191 self.versions.ensure_initialized(self.data_store, True)
195 ## Pretend upgrades through 26 are complete.192 ## Pretend upgrades through 26 are complete.
196 self.data_store.update_version(26)193 self.data_store.update_version(26)


People subscribed via source and target branches

to all changes: