Merge lp:~abentley/charmworld/remove-018-migration into lp:~juju-jitsu/charmworld/trunk

[Aaron Bentley]

Remove 018 migration; before an exodus and already deployed to production.

Remove the 018 migration so that deployment is possible.

The 019 migration is an exodus, so no migrations are permitted before it. This currently blocks new deployments.

[lp:~abentley/charmworld/remove-018-migration]

432. By Aaron Bentley on 2013-10-25

Remove tests for 018.

433. By Aaron Bentley on 2013-10-25

Add test to ensure that migrations follow exodus rules.

[Brad Crittenden (bac)]

review: Approve (code)

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

review: Approve (continuous-integration)

=== removed file 'charmworld/migrations/versions/018_delete_all_bundles.py'
--- charmworld/migrations/versions/018_delete_all_bundles.py	2013-09-05 21:36:14 +0000
+++ charmworld/migrations/versions/018_delete_all_bundles.py	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-# Copyright 2013 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from charmworld.search import (
-    BUNDLE,
-    IndexMissing,
-    translate_error,
-)
-
-
-def upgrade(db, index_client):
-    db.bundles.remove({}, False)
-    try:
-        with translate_error():
-            index_client._client.delete_all(index_client.index_name, BUNDLE)
-    except IndexMissing:
-        # There is nothing to migrate.
-        pass
 
=== modified file 'charmworld/migrations/versions/tests/test_migrations.py'
--- charmworld/migrations/versions/tests/test_migrations.py	2013-10-24 17:24:43 +0000
+++ charmworld/migrations/versions/tests/test_migrations.py	2013-10-25 23:11:01 +0000
@@ -31,64 +31,6 @@
         self.use_context(mock.patch.object(migrate, 'configure_logging'))
 
 
-class TestMigration018(MigrationTestBase):
-
-    def setUp(self):
-        super(TestMigration018, self).setUp()
-        self.use_index_client()
-        self.store_some_bundles()
-
-    def store_some_bundles(self):
-        deployer_config = textwrap.dedent("""\
-            wordpress-stage:
-                series: precise
-                services:
-                    blog:
-                        charm: cs:precise/wordpress
-                        constraints: mem=2
-                        options:
-                            tuning: optimized
-                            engine: apache
-        """)
-        parsed = yaml.safe_load(deployer_config)
-        owner = 'owner'
-        bundle_name = 'wordpress-stage'
-        basket_name = 'wordpress-basket'
-        basket_rev = 3
-        basket_id = "%s/%d" % (basket_name, basket_rev)
-        self.search_id = Bundle.construct_id(
-            owner, basket_name, bundle_name)
-        store_bundles(
-            self.db.bundles, parsed, owner, basket_id,
-            None, None, None, None,
-            index_client=self.index_client)
-
-    def test_bundles_are_removed_from_elastic_search(self):
-        assert self.index_client.get(self.search_id, BUNDLE), (
-            'the test bundle is missing')
-        self.versions.run_migration(
-            self.db, self.index_client, '018_delete_all_bundles.py')
-        self.assertIsNone(self.index_client.get(self.search_id, BUNDLE))
-
-    def test_bundles_are_removed_from_mongo(self):
-        assert self.index_client.get(self.search_id, BUNDLE), (
-            'the test bundle is missing')
-        self.versions.run_migration(
-            self.db, self.index_client, '018_delete_all_bundles.py')
-        self.assertIsNone(self.db.bundles.find_one({}))
-
-    def test_new_db_and_index_are_noop(self):
-        # The migration script survives MIssingIndex errors.
-        # New installs don't have ES indexes yet.
-        self.index_client.delete_index()
-        with self.assertRaises(IndexMissing):
-            self.index_client.get_status()
-        self.versions.run_migration(
-            self.db, self.index_client, '018_delete_all_bundles.py')
-        # Put the index back for the test case to handle.
-        self.index_client.create_index()
-
-
 class TestMigration019(MigrationTestBase):
 
     def setUp(self):
@@ -166,3 +108,10 @@
             self.versions.run_migration,
             self.db, self.index_client,
             '020_adds_type_field_to_existing_review_items.py')
+
+
+class TestExodusRestrictions(MigrationTestBase):
+
+    def test_exodus_restrictions(self):
+        """Ensure that deploy-from-scratch does not violate exodus rules."""
+        self.versions._check_exodus(self.versions.list_pending(0))