Merge lp:~jml/pkgme-service/remove-django-fixture into lp:pkgme-service

[Jonathan Lange]

Remove DjangoFixture

Now that DjangoFixture lives in its own project (cunningly designated
lp:djangofixture), we don't need to have it in pkgme-service.

[James Westby (james-w)]

review: Approve

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-08-23 04:14:21 +0000
+++ buildout.cfg	2012-10-25 14:30:45 +0000
@@ -30,6 +30,7 @@
 recipe = z3c.recipe.scripts
 # Test dependencies get added here
 eggs = django-pkgme
+       djangofixture
        django-kombu
        mock
        testtools
 
=== modified file 'distribute_setup.py'
--- distribute_setup.py	2012-08-23 04:14:21 +0000
+++ distribute_setup.py	2012-10-25 14:30:45 +0000
@@ -46,9 +46,7 @@
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-# jml's fork of distribute.  Code lives at
-# https://bitbucket.org/mumak/distribute.
-DEFAULT_VERSION = "0.6.29DEV"
+DEFAULT_VERSION = "0.6.30"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
 
=== modified file 'src/djpkgme/tests/test_integration.py'
--- src/djpkgme/tests/test_integration.py	2012-10-23 20:23:39 +0000
+++ src/djpkgme/tests/test_integration.py	2012-10-25 14:30:45 +0000
@@ -1,14 +1,9 @@
-import errno
 import json
 import os
 import subprocess
 import sys
-import time
-from urllib2 import (
-    URLError,
-    urlopen,
-    )
 
+from djangofixture import DjangoFixture
 from fixtures import (
     EnvironmentVariableFixture,
     Fixture,
@@ -40,7 +35,6 @@
     get_acceptance_data_path,
     TestCaseWithFactory,
     )
-from djpkgme.views import ALL_CLEAR
 from djpkgme.tasks import get_url_for_file
 
 
@@ -152,54 +146,6 @@
         self.addCleanup(self.flush_db)
 
 
-class DjangoFixture(Fixture):
-    """A simple Django service, with database.
-
-    Essentially does 'runserver'.
-    """
-
-    def poll_until_running(self, port):
-        url = 'http://localhost:%s/pkgme/' % (port,)
-        for i in range(100):
-            try:
-                response = urlopen(url)
-            except URLError, e:
-                error_no = getattr(e.reason, 'errno', None)
-                if error_no in (errno.ECONNREFUSED, errno.ECONNRESET):
-                    time.sleep(0.05)
-                    continue
-                raise
-            except IOError, e:
-                if e.errno in (errno.ECONNREFUSED, errno.ECONNRESET):
-                    time.sleep(0.05)
-                    continue
-                raise
-            data = response.read()
-            if data == ALL_CLEAR:
-                return
-        raise TimeoutError("Timed out waiting for %s to come up" % (url,))
-
-    def setUp(self):
-        super(DjangoFixture, self).setUp()
-        # XXX: parallelism: Hard-code the port to run on for now. Don't know
-        # how to figure out what port it's actually listening on.
-        self.port = 8001
-        self.process = subprocess.Popen(
-            [sys.executable, get_manage_location(),
-             'runserver', '--noreload', str(self.port)],
-            stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        # Just terminate the process. In the future, might want to change this
-        # to a more heavyweight two-stage kill.
-        self.addCleanup(self.process.terminate)
-        self.addCleanup(
-            self.addDetail,
-            'runserver-log',
-            Content(
-                UTF8_TEXT,
-                self.process.stdout.readlines))
-        self.poll_until_running(self.port)
-
-
 def submit_local_files(service_root, file_path, metadata):
     """Submit 'path' to pkgme-service at 'service_root' with 'metadata'.
 
@@ -240,7 +186,7 @@
             DjangoSettings(djpkgme=dict(pkgme_output_directory=output_dir)))
         self.useFixture(DjangoDatabase())
         self.useFixture(CeleryFixture())
-        self.useFixture(DjangoFixture())
+        self.useFixture(DjangoFixture('pkgme/'))
         settings_output = manage(['settings', '--show'])
         self.addDetail('django-settings', text_content(settings_output))
         def get_output_dir_contents():
 
=== modified file 'versions.cfg'
--- versions.cfg	2012-10-23 14:18:48 +0000
+++ versions.cfg	2012-10-25 14:30:45 +0000
@@ -15,9 +15,9 @@
 celery = 2.5.0
 Cheetah = 2.4.4
 configglue = 1.0.1
-# jml's fork.  Code lives at https://bitbucket.org/mumak/distribute.
-distribute = 0.6.29DEV
+distribute = 0.6.30
 Django = 1.3.1
+djangofixture = 0.1
 django-celery = 2.5.0
 django-configglue = 0.6.1
 django-configglue = 0.6.1
@@ -59,7 +59,7 @@
 South = 0.7.3
 storm = 0.19
 testresources = 0.2.5
-testtools = 0.9.16
+testtools = 0.9.21
 treeshape = 0.2.1
 twisted = 11.1.0
 txpkgme = 0.2