Merge lp:~jcsackett/charmworld/fix-enqueue-sort-failure into lp:charmworld

[j.c.sackett]

Fixes an enqueue error for ingest that occurs because of a non-indexed sort.

This branch removes the sorting on db_charms, which we don't need because we
throw the results into a dict immediately.

The sort causes mongo to explode because the data is too large to sort without
an index.

[Brad Crittenden (bac)]

Looks good Jon.

review: Approve (code)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://162.213.35.27:8080/job/charmworld-autoland-lxc/105/
Executed test runs:

review: Needs Fixing (continuous-integration)

[j.c.sackett (jcsackett)]

This may be spurious; resubmitting.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://162.213.35.27:8080/job/charmworld-autoland-lxc/106/
Executed test runs:

review: Needs Fixing (continuous-integration)

[lp:~jcsackett/charmworld/fix-enqueue-sort-failure]

481. By j.c.sackett on 2014-01-22

Shut up, lint.

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

review: Approve (continuous-integration)

=== modified file 'charmworld/jobs/lp.py'
--- charmworld/jobs/lp.py	2014-01-16 14:57:47 +0000
+++ charmworld/jobs/lp.py	2014-01-22 15:27:53 +0000
@@ -7,7 +7,6 @@
     datetime,
 )
 import logging
-import pymongo
 import sys
 
 from charmworld.charmstore import (
@@ -82,8 +81,7 @@
     # Return data needed for the ingest job for charms stored in
     # charmworld's database.
     for charm in db.charms.find(
-            fields=('owner', 'series', 'name', 'bname', 'branch_spec'),
-            sort=[('branch_spec', pymongo.ASCENDING)]):
+            fields=('owner', 'series', 'name', 'bname', 'branch_spec')):
         # Override the promulgation related settings: Data from this iterator
         # is used by all_charms() only when the charm no longer has a related
         # Launchpad branch. A charm is promulgated if its LP branch is linked

=== modified file 'charmworld/jobs/tests/test_lp.py'
--- charmworld/jobs/tests/test_lp.py	2014-01-16 14:57:47 +0000
+++ charmworld/jobs/tests/test_lp.py	2014-01-22 15:27:53 +0000
@@ -179,7 +179,7 @@
             self.db, owner='o1', series='s1', name='c2')[1]
         charm_4 = factory.makeCharm(
             self.db, owner='o1', series='s1', name='c1')[1]
-        result = [c['branch_spec'] for c in db_charms(self.db)]
+        result = sorted([c['branch_spec'] for c in db_charms(self.db)])
         expected = [
             c['branch_spec'] for c in (charm_4, charm_3, charm_2, charm_1)]
         self.assertEqual(expected, result)