Merge lp:~abentley/charmworld/really-remove-icon into lp:~juju-jitsu/charmworld/trunk

[Aaron Bentley]

Fix icon deletion, make version number 6.

The previous attempt to delete icons from the charm docs lacked the crucial multi flag, so it migrated only one document. This version, migration version 6, deletes all icons.

[Curtis Hovey (sinzui)]

Thank you. The multi=True option is a bit like the g/global option in RE that trips me up when doing substitutions.

review: Approve (code)

=== added file 'migrations/versions/005_no_op.py'
--- migrations/versions/005_no_op.py	1970-01-01 00:00:00 +0000
+++ migrations/versions/005_no_op.py	2013-06-04 18:24:39 +0000
@@ -0,0 +1,5 @@
+# Copyright 2013 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+def upgrade(db, index_client):
+    """005 failed to remove icons from charms, so now disabled."""
 
=== renamed file 'migrations/versions/005_delete_icon_field.py' => 'migrations/versions/006_delete_icon_field.py'
--- migrations/versions/005_delete_icon_field.py	2013-06-04 15:36:45 +0000
+++ migrations/versions/006_delete_icon_field.py	2013-06-04 18:24:39 +0000
@@ -4,5 +4,5 @@
 
 
 def upgrade(db, index_client):
-    db.charms.update({}, {'$unset': {'icon':''}})
+    db.charms.update({}, {'$unset': {'icon':''}}, multi=True)
     reindex(index_client, list(db.charms.find({})))
 
=== modified file 'migrations/versions/tests/test_migrations.py'
--- migrations/versions/tests/test_migrations.py	2013-06-04 15:36:45 +0000
+++ migrations/versions/tests/test_migrations.py	2013-06-04 18:24:39 +0000
@@ -66,12 +66,15 @@
         self.assertNotIn('charm-errors', self.db.collection_names())
 
 
-class TestMigration005(MongoTestBase):
+class TestMigration006(MongoTestBase):
 
     def test_migration(self):
         self.use_index_client()
         source = CharmSource.from_request(self)
         source.save({'_id': 'a', 'icon': 'asdf', 'asdf': 'asdf'})
-        run_migration(self.db, self.index_client, '005_delete_icon_field.py')
+        source.save({'_id': 'b', 'icon': 'asdf', 'asdf': 'asdf'})
+        run_migration(self.db, self.index_client, '006_delete_icon_field.py')
         for charm in source._get_all('a'):
             self.assertNotIn('icon', charm)
+        for charm in source._get_all('b'):
+            self.assertNotIn('icon', charm)