Merge lp:~jml/pkgme-service/juju-integration-tests into lp:pkgme-service

[Jonathan Lange]

Move testing helpers to new testing package.

Move testing helpers to new testing package.

[Canonical CA Tarmac (ca-tarmac)]

The attempt to merge lp:~jml/pkgme-service/juju-integration-tests into lp:pkgme-service failed. Below is the output from the failed tests.

error: Could not find suitable distribution for Requirement.parse('bzr==2.4.2')

Fatal error: local() encountered an error (return code 1) while executing 'virtualenv/bin/python setup.py develop'

Aborting.

[lp:~jml/pkgme-service/juju-integration-tests]

102. By Jonathan Lange on 2012-07-12

Move the big & slow tests to a different package so they are not run by default.

103. By Jonathan Lange on 2012-07-12

Make sure we run all the tests when we land branches.

104. By Jonathan Lange on 2012-07-12

Need this to land things

105. By Jonathan Lange on 2012-07-12

Initial (broken) attempt at running the integration tests with juju

106. By Jonathan Lange on 2012-07-12

disable commits

107. By Jonathan Lange on 2012-07-12

Test that deploys a service and then destroys service.

108. By Jonathan Lange on 2012-07-13

RED: Add a test that starts to actually use the juju charm.
Point out errors and how to fix them.
Make a get_ip_address thing on the Juju fixture.

Unmerged revisions

108. By Jonathan Lange on 2012-07-13

RED: Add a test that starts to actually use the juju charm.
Point out errors and how to fix them.
Make a get_ip_address thing on the Juju fixture.

107. By Jonathan Lange on 2012-07-12

Test that deploys a service and then destroys service.

106. By Jonathan Lange on 2012-07-12

disable commits

105. By Jonathan Lange on 2012-07-12

Initial (broken) attempt at running the integration tests with juju

104. By Jonathan Lange on 2012-07-12

Need this to land things

103. By Jonathan Lange on 2012-07-12

Make sure we run all the tests when we land branches.

102. By Jonathan Lange on 2012-07-12

Move the big & slow tests to a different package so they are not run by default.

101. By Jonathan Lange on 2012-07-12

Don't import Django by default.

100. By Jonathan Lange on 2012-07-12

Replace cargo culted settings patch with monkey patch helper.

99. By Jonathan Lange on 2012-07-12

Move test helpers to separate package.

=== modified file 'fabtasks/django.py'
--- fabtasks/django.py	2012-04-12 18:58:30 +0000
+++ fabtasks/django.py	2012-07-13 08:21:21 +0000
@@ -12,6 +12,14 @@
         spec = "djpkgme"
     manage("test", spec)
 
+
+def bigtests():
+    """Run the big tests."""
+    local(
+        "DJANGO_SETTINGS_MODULE=django_project.settings "
+        "virtualenv/bin/python -m testtools.run discover djpkgme.bigtests")
+
+
 def runserver(port=8001):
     manage("runserver", str(port))
 

=== added directory 'src/djpkgme/bigtests'
=== added file 'src/djpkgme/bigtests/__init__.py'
--- src/djpkgme/bigtests/__init__.py	1970-01-01 00:00:00 +0000
+++ src/djpkgme/bigtests/__init__.py	2012-07-13 08:21:21 +0000
@@ -0,0 +1,6 @@
+"""Big tests. Or medium tests.
+
+http://googletesting.blogspot.co.uk/2010/12/test-sizes.html
+"""
+
+from .test_integration import *

=== renamed file 'src/djpkgme/tests/test_integration.py' => 'src/djpkgme/bigtests/test_integration.py'
--- src/djpkgme/tests/test_integration.py	2012-03-26 17:44:03 +0000
+++ src/djpkgme/bigtests/test_integration.py	2012-07-13 08:21:21 +0000
@@ -8,6 +8,7 @@
     URLError,
     urlopen,
     )
+import uuid
 
 from fixtures import (
     EnvironmentVariableFixture,
@@ -26,11 +27,12 @@
     Contains,
     Equals,
     )
+from testtools import TestCase
 from twisted.internet.error import TimeoutError
 
 from devportalbinary.testing import DatabaseFixture
 from djpkgme.harness import WebServer
-from djpkgme.tests.factory import (
+from djpkgme.testing.factory import (
     get_acceptance_data_path,
     TestCaseWithFactory,
     )
@@ -191,6 +193,101 @@
         self.poll_until_running(self.port)
 
 
+class CommandFailed(Exception):
+
+    def __init__(self, command, returncode, output, error):
+        super(CommandFailed, self).__init__(command, returncode, output, error)
+        self.command = command
+        self.returncode = returncode
+        self.output = output
+        self.error = error
+
+    def __str__(self):
+        return "%s failed with returncode %s. Output:\n%s\nError:\n%s" % (
+            ' '.join(self.command),
+            self.returncode,
+            '\n'.join(' | %s' % (line,)
+                      for line in self.output.splitlines()),
+            '\n'.join(' | %s' % (line,)
+                      for line in self.error.splitlines()),
+            )
+
+
+def run_script(*command):
+    p = subprocess.Popen(
+        command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    out, err = p.communicate()
+    if p.returncode:
+        raise CommandFailed(command, p.returncode, out, err)
+    return out
+
+
+class JujuService(Fixture):
+
+    # XXX: Need to handle charms from the store also.
+
+    # XXX: Maybe the parameters should be a path to a charm?
+    def __init__(self, charm_name, repository, service_name=None):
+        super(JujuService, self)
+        self.charm_name = charm_name
+        self.repository = repository
+        if service_name is None:
+            service_name = '-'.join([charm_name, str(uuid.uuid4())])
+        self.service_name = service_name
+
+    def get_ip_address(self):
+        out = run_script('juju', 'status', self.service_name)
+        for line in out.splitlines():
+            if 'public-address' in line:
+                return line.split(':')[1].strip()
+        raise ValueError("Could not find public address")
+
+    def setUp(self):
+        super(JujuService, self).setUp()
+        # XXX: Block until actually running.  Use jitsu.
+        # jitsu watch pkgme-service --x-state=pending --num-units=1
+        #
+        # XXX: Somehow get the debug log (and maybe the machine-agent.log?)
+        # and attach as details.
+        run_script(
+            'juju', 'deploy', '--repository', self.repository,
+            'local:%s' % (self.charm_name,), self.service_name)
+        # XXX: Test this.
+        self.addCleanup(run_script, 'juju', 'destroy-service', self.service_name)
+        run_script(
+            'jitsu', 'watch', self.service_name, '--x-state=pending',
+            '--num-units=1')
+        # XXX: Extract into function
+        status = run_script('juju', 'status', self.service_name)
+        if 'agent-state: started' not in status:
+            raise ValueError(status)
+
+
+class TestJuju(TestCase):
+
+    def test_before_setup(self):
+        pass
+
+    def disabled_test_service(self):
+        charm_name = 'pkgme-service'
+        up = os.path.dirname
+        charm_path = os.path.join(up(up(up(up(__file__)))), 'charms')
+        s = JujuService(charm_name, charm_path)
+        try:
+            s.setUp()
+            out = run_script('juju', 'status', s.service_name)
+            # XXX: Terrible assertion.  Fragile, as we are going to be sharing
+            # this environment with other things.
+            self.assertIn(charm_name, out)
+            self.assertIn('agent-state: started', out)
+        finally:
+            s.cleanUp()
+            out = run_script('juju', 'status', s.service_name)
+            # XXX: Terrible assertion.  Fragile, as we are going to be sharing
+            # this environment with other things.
+            self.assertNotIn(s.service_name, out)
+
+
 class TestEndToEnd(TestCaseWithFactory):
     """Full end-to-end tests.
 
@@ -216,7 +313,7 @@
         return AfterPreprocessing(
             lambda x: x['packaged_app_url'], Equals(url))
 
-    def expect_success(self, metadata, file_path, body_matcher):
+    def expect_success(self, pkgme_url, metadata, file_path, body_matcher):
         """Package 'file_path' with 'metadata' and expect success.
 
         :param metadata: A dict of metadata, such as would be submitted from a
@@ -224,8 +321,7 @@
         :param file_path: A path to a file on disk to upload for packaging.
         :param body_matcher: A Matcher that the parsed JSON body must match.
         """
-        self.set_up_pkgme_service()
-        harness = WebServer(file_path)
+        harness = WebServer(file_path, pkgme_url)
         d = harness.run(metadata)
         def callback_received((method, json_body)):
             body = json.loads(json_body)
@@ -259,7 +355,7 @@
         d.addBoth(harness.shut_down_web_server)
         return d
 
-    def test_gtk(self):
+    def disable_test_gtk(self):
         package_name = self.factory.get_unique_string('package-name')
         metadata = {
             'package_name': package_name,
@@ -278,13 +374,46 @@
             self.packaged_app_url_equals(
                 get_url_for_file('%s.tar.gz' % (package_name,))))
 
-    def test_error_when_packaging(self):
+    def test_juju(self):
+        package_name = self.factory.get_unique_string('package-name')
+        metadata = {
+            'package_name': package_name,
+            'description': self.factory.get_unique_string('description'),
+            'tagline': self.factory.get_unique_string('tagline'),
+            'myapps_id': self.factory.get_unique_integer(),
+            }
+        tarball_path = self.factory.make_tarball(
+            get_acceptance_data_path('gtk'))
+
+        charm_name = 'pkgme-service'
+        up = os.path.dirname
+        charm_path = os.path.join(up(up(up(up(__file__)))), 'charms')
+        pkgme_service = self.useFixture(JujuService(charm_name, charm_path))
+
+        pkgme_url = 'http://%s/pkgme/api/1.0' % (pkgme_service.get_ip_address(),)
+
+        # Sets the home dir. Yuck.
+        pkg_db = self.useFixture(DatabaseFixture())
+
+        self.factory.add_dependencies_for_test_data(pkg_db)
+
+        # XXX: This fails because pkgme-service isn't actually actually
+        # running.  It needs a postgresql instance to be up and running and to
+        # have the postgresql:db relation hooked up to it.  To do this, we
+        # need a fixture that will fire up charms from the store, rather than
+        # simply local charms and a way to add interfaces.
+        return self.expect_success(
+            pkgme_url, metadata, tarball_path,
+            self.packaged_app_url_equals(
+                get_url_for_file('%s.tar.gz' % (package_name,))))
+
+    def disable_test_error_when_packaging(self):
         metadata = self.factory.make_metadata()
         tarball_path = self.factory.make_tarball(
             get_acceptance_data_path('python'))
         return self.expect_error(metadata, tarball_path, Contains('error'))
 
-    def test_pdf(self):
+    def disable_test_pdf(self):
         metadata = {
             'package_name': "jabberwocky",
             'description': "The Jabberwocky",

=== added file 'src/djpkgme/bigtests/test_tasks.py'
--- src/djpkgme/bigtests/test_tasks.py	1970-01-01 00:00:00 +0000
+++ src/djpkgme/bigtests/test_tasks.py	2012-07-13 08:21:21 +0000
@@ -0,0 +1,121 @@
+import os
+import tarfile
+
+from fixtures import TempDir
+from pkgme.info_elements import PackageName
+from pkgme.testing import (
+    DirContains,
+    DirExists,
+    )
+# In lucid, python-debian exports its package as 'debian_bundle'.
+from testtools import try_imports
+changelog = try_imports(['debian.changelog', 'debian_bundle.changelog'])
+
+from devportalbinary.metadata import MetadataBackend
+from devportalbinary.testing import DatabaseFixture
+
+# XXX: This will probably require us to use the django runner for bigtests.
+from django.conf import settings
+
+from djpkgme import tasks
+from djpkgme.tasks import BuildPackageTask
+from djpkgme.testing.factory import TestCaseWithFactory
+from djpkgme.testing.helpers import patch_settings
+
+
+class TestBuildPackageTaskIntegration(TestCaseWithFactory):
+    """Tests that actually build the package."""
+
+    def run_task(self, metadata, file_path):
+        task = BuildPackageTask()
+        def download_file(url, output_dir):
+            # Create a tarball and stick it in 'output_dir'.
+            proper_location = os.path.join(
+                output_dir, os.path.basename(file_path))
+            os.rename(file_path, proper_location)
+            return proper_location
+        self.patch(tasks, 'download_file', download_file)
+        pkg_db = self.useFixture(DatabaseFixture())
+        self.factory.add_dependencies_for_test_data(pkg_db)
+        temp_dir = self.useFixture(TempDir()).path
+        self.patch(settings, 'PKGME_OUTPUT_DIRECTORY', temp_dir)
+        return task.build_package(metadata, {})
+
+    def disable_test_writes_packaging_for_tarball(self):
+        # BuildPackageTask.build_package runs pkgme to build the package and
+        # outputs a tarball to the given path. Here we're testing the happy
+        # case.
+        metadata = self.factory.make_metadata()
+        package_name = metadata['package_name']
+        unpack_dir = self.useFixture(TempDir()).path
+        output_tar_path = self.run_task(
+            metadata, self.factory.make_packagable_tarball())
+        output_tar = tarfile.open(output_tar_path, 'r:gz')
+        try:
+            output_tar.extractall(unpack_dir)
+        finally:
+            output_tar.close()
+        self.assertThat(
+            unpack_dir,
+            DirContains(
+                ['%s_0.dsc' % (package_name,),
+                 '%s_0.tar.gz' % (package_name,),
+                 '%s_0_source.build' % (package_name,),
+                 '%s_0_source.changes' % (package_name,),
+                 MetadataBackend.METADATA_FILE,
+                 ]))
+        package_tarball_path = os.path.join(
+            unpack_dir, '%s_0.tar.gz' % (package_name,))
+        t = tarfile.open(package_tarball_path)
+        try:
+            t.extractall(unpack_dir)
+        finally:
+            t.close()
+        debian_dir = os.path.join(unpack_dir, package_name, 'debian')
+        self.assertThat(debian_dir, DirExists())
+        # Assert that it has some packaging, but not all of the details about
+
+
+        # exactly what packaging it creates.
+        self.assertIn('control', os.listdir(debian_dir))
+
+    def disable_test_uses_cleaned_package_name_for_tarball_name(self):
+        # BuildPackageTask.build_package uses the cleaned version of the
+        # package name as the tarball name.
+        # Set up the metadata with no package_name and no
+        # suggested_package_name so that it will use 'name' instead.
+        name = 'hopefully unique application name'
+        metadata = self.factory.make_metadata(application_name=name)
+        del metadata['package_name']
+        del metadata['suggested_package_name']
+        output_tar_path = self.run_task(
+            metadata, self.factory.make_packagable_tarball())
+        basename = os.path.basename(output_tar_path)
+        cleaned_package_name = PackageName.clean(name)
+        self.assertEqual("%s.tar.gz" % cleaned_package_name, basename)
+
+    def disable_test_uses_pkgme_maintainer_email(self):
+        unpack_dir = self.useFixture(TempDir()).path
+        metadata = self.factory.make_metadata()
+        debemail = 'Dude <[e-mail]>'
+        with patch_settings(PKGME_MAINTAINER_EMAIL=debemail):
+            output_tar_path = self.run_task(
+                metadata, self.factory.make_packagable_tarball())
+        output_tar = tarfile.open(output_tar_path, 'r:gz')
+        try:
+            output_tar.extractall(unpack_dir)
+        finally:
+            output_tar.close()
+        package_name = metadata['package_name']
+        package_tarball_path = os.path.join(
+            unpack_dir, '%s_0.tar.gz' % (package_name,))
+        t = tarfile.open(package_tarball_path)
+        try:
+            t.extractall(unpack_dir)
+        finally:
+            t.close()
+        debian_dir = os.path.join(unpack_dir, package_name, 'debian')
+        changelog_path = os.path.join(debian_dir, 'changelog')
+        cl = changelog.Changelog(open(changelog_path).read())
+        [change_block] = list(cl)
+        self.assertEqual(debemail, change_block.author)

=== modified file 'src/djpkgme/tasks.py'
--- src/djpkgme/tasks.py	2012-06-14 15:23:26 +0000
+++ src/djpkgme/tasks.py	2012-07-13 08:21:21 +0000
@@ -10,6 +10,7 @@
 
 from bzrlib.urlutils import join as urljoin
 from celery.registry import tasks
+from celery.signals import worker_process_init
 from celery.task import Task
 from django.conf import settings
 from httplib2 import Http
@@ -532,4 +533,8 @@
 tasks.register(CauseOopsTask)
 
 
-setup_oops_reporter(config_from_dict(settings.OOPSES))
+def connect_to_oops(*args, **kwargs):
+    setup_oops_reporter(config_from_dict(settings.OOPSES))
+
+
+worker_process_init.connect(connect_to_oops)

=== added directory 'src/djpkgme/testing'
=== added file 'src/djpkgme/testing/__init__.py'
--- src/djpkgme/testing/__init__.py	1970-01-01 00:00:00 +0000
+++ src/djpkgme/testing/__init__.py	2012-07-13 08:21:21 +0000
@@ -0,0 +1,1 @@
+"""Things to aid testing."""

=== renamed file 'src/djpkgme/tests/factory.py' => 'src/djpkgme/testing/factory.py'
--- src/djpkgme/tests/factory.py	2012-03-04 15:05:47 +0000
+++ src/djpkgme/testing/factory.py	2012-07-13 08:21:21 +0000
@@ -3,7 +3,6 @@
 import tarfile
 
 from devportalbinary.metadata import MetadataBackend
-from django.test import TestCase as DjangoTestCase
 from fixtures import (
     Fixture,
     TempDir,
@@ -12,6 +11,7 @@
     RunTest,
     TestCase,
     )
+from .helpers import patch_settings
 
 __all__ = [
     'TestCaseWithFactory',
@@ -121,13 +121,13 @@
     Use this runner to get that same effect with testtools.
     """
 
-    class MyDjangoTestCase(DjangoTestCase):
-        def test_foo(self):
-            pass
-
     def __init__(self, case, handlers=None):
         super(DjangoRunner, self).__init__(case, handlers=handlers)
-        self._django_case = self.MyDjangoTestCase('test_foo')
+        from django.test import TestCase as DjangoTestCase
+        class MyDjangoTestCase(DjangoTestCase):
+            def test_foo(self):
+                pass
+        self._django_case = MyDjangoTestCase('test_foo')
 
     def _run_core(self):
         self._run_user(self._django_case._pre_setup)

=== renamed file 'src/djpkgme/tests/helpers.py' => 'src/djpkgme/testing/helpers.py'
--- src/djpkgme/tests/helpers.py	2012-02-28 13:49:09 +0000
+++ src/djpkgme/testing/helpers.py	2012-07-13 08:21:21 +0000
@@ -1,5 +1,8 @@
-from django.conf import settings
-from contextlib import contextmanager
+from contextlib import (
+    contextmanager,
+    nested,
+    )
+from fixtures import MonkeyPatch
 
 
 class FakeResponse(dict):
@@ -14,29 +17,10 @@
         self.previous = previous
 
 
-# Original snippet from http://djangosnippets.org/snippets/2156/
-class SettingDoesNotExist:
-    pass
-
-
-def switch_settings(**kwargs):
-    """Helper method that updates settings and returns old settings."""
-    old_settings = {}
-    for key, new_value in kwargs.items():
-        old_value = getattr(settings, key, SettingDoesNotExist)
-        old_settings[key] = old_value
-
-        if new_value is SettingDoesNotExist:
-            delattr(settings, key)
-        else:
-            setattr(settings, key, new_value)
-
-    return old_settings
-
-
 @contextmanager
-def patch_settings(**kwargs):
-    old_settings = switch_settings(**kwargs)
-    yield
-    switch_settings(**old_settings)
-# end snippet
+def patch_settings(**settings):
+    fixtures = [
+        MonkeyPatch('django.conf.settings.%s' % (name,), value)
+        for name, value in settings.items()]
+    with nested(*fixtures):
+        yield

=== modified file 'src/djpkgme/tests/__init__.py'
--- src/djpkgme/tests/__init__.py	2012-02-29 21:33:25 +0000
+++ src/djpkgme/tests/__init__.py	2012-07-13 08:21:21 +0000
@@ -1,5 +1,4 @@
 from .test_handlers import *
 from .test_harness import *
-from .test_integration import *
 from .test_preflight import *
 from .test_tasks import *

=== modified file 'src/djpkgme/tests/test_handlers.py'
--- src/djpkgme/tests/test_handlers.py	2012-03-12 14:10:27 +0000
+++ src/djpkgme/tests/test_handlers.py	2012-07-13 08:21:21 +0000
@@ -8,8 +8,8 @@
     PackageHandler,
     VersionHandler,
     )
-from djpkgme.tests.factory import TestCaseWithFactory
-from djpkgme.tests.helpers import FakeResponse
+from djpkgme.testing.factory import TestCaseWithFactory
+from djpkgme.testing.helpers import FakeResponse
 
 
 test_metadata = {

=== modified file 'src/djpkgme/tests/test_tasks.py'
--- src/djpkgme/tests/test_tasks.py	2012-07-10 11:30:50 +0000
+++ src/djpkgme/tests/test_tasks.py	2012-07-13 08:21:21 +0000
@@ -9,19 +9,13 @@
 import traceback
 import zipfile
 
-# In lucid, python-debian exports its package as 'debian_bundle'.
-from testtools import try_imports
-changelog = try_imports(['debian.changelog', 'debian_bundle.changelog'])
-
 from devportalbinary.metadata import MetadataBackend
 from django.conf import settings
 from fixtures import TempDir
 import mock
 from mock import patch
 from pkgme.errors import PkgmeError
-from pkgme.info_elements import PackageName
 from pkgme.testing import (
-    DirContains,
     DirExists,
     FileContains,
     )
@@ -33,7 +27,6 @@
     )
 from testtools import TestCase
 
-from devportalbinary.testing import DatabaseFixture
 from djpkgme import tasks
 from djpkgme.tasks import (
     as_pkgme_dict,
@@ -44,10 +37,10 @@
     submit_to_myapps,
     translate_dict,
     )
-from djpkgme.tests.factory import (
+from djpkgme.testing.factory import (
     TestCaseWithFactory,
     )
-from djpkgme.tests.helpers import (
+from djpkgme.testing.helpers import (
     FakeResponse,
     patch_settings,
     )
@@ -641,100 +634,3 @@
         task = BuildPackageTask()
         prepared = task.prepare_metadata(path, metadata)
         self.assertEqual(expected, prepared)
-
-
-
-class TestBuildPackageTaskIntegration(TestCaseWithFactory):
-    """Tests that actually build the package."""
-
-    def run_task(self, metadata, file_path):
-        task = BuildPackageTask()
-        def download_file(url, output_dir):
-            # Create a tarball and stick it in 'output_dir'.
-            proper_location = os.path.join(
-                output_dir, os.path.basename(file_path))
-            os.rename(file_path, proper_location)
-            return proper_location
-        self.patch(tasks, 'download_file', download_file)
-        pkg_db = self.useFixture(DatabaseFixture())
-        self.factory.add_dependencies_for_test_data(pkg_db)
-        temp_dir = self.useFixture(TempDir()).path
-        self.patch(settings, 'PKGME_OUTPUT_DIRECTORY', temp_dir)
-        return task.build_package(metadata, {})
-
-    def test_writes_packaging_for_tarball(self):
-        # BuildPackageTask.build_package runs pkgme to build the package and
-        # outputs a tarball to the given path. Here we're testing the happy
-        # case.
-        metadata = self.factory.make_metadata()
-        package_name = metadata['package_name']
-        unpack_dir = self.useFixture(TempDir()).path
-        output_tar_path = self.run_task(
-            metadata, self.factory.make_packagable_tarball())
-        output_tar = tarfile.open(output_tar_path, 'r:gz')
-        try:
-            output_tar.extractall(unpack_dir)
-        finally:
-            output_tar.close()
-        self.assertThat(
-            unpack_dir,
-            DirContains(
-                ['%s_0.dsc' % (package_name,),
-                 '%s_0.tar.gz' % (package_name,),
-                 '%s_0_source.build' % (package_name,),
-                 '%s_0_source.changes' % (package_name,),
-                 MetadataBackend.METADATA_FILE,
-                 ]))
-        package_tarball_path = os.path.join(
-            unpack_dir, '%s_0.tar.gz' % (package_name,))
-        t = tarfile.open(package_tarball_path)
-        try:
-            t.extractall(unpack_dir)
-        finally:
-            t.close()
-        debian_dir = os.path.join(unpack_dir, package_name, 'debian')
-        self.assertThat(debian_dir, DirExists())
-        # Assert that it has some packaging, but not all of the details about
-        # exactly what packaging it creates.
-        self.assertIn('control', os.listdir(debian_dir))
-
-    def test_uses_cleaned_package_name_for_tarball_name(self):
-        # BuildPackageTask.build_package uses the cleaned version of the
-        # package name as the tarball name.
-        # Set up the metadata with no package_name and no
-        # suggested_package_name so that it will use 'name' instead.
-        name = 'hopefully unique application name'
-        metadata = self.factory.make_metadata(application_name=name)
-        del metadata['package_name']
-        del metadata['suggested_package_name']
-        output_tar_path = self.run_task(
-            metadata, self.factory.make_packagable_tarball())
-        basename = os.path.basename(output_tar_path)
-        cleaned_package_name = PackageName.clean(name)
-        self.assertEqual("%s.tar.gz" % cleaned_package_name, basename)
-
-    def test_uses_pkgme_maintainer_email(self):
-        unpack_dir = self.useFixture(TempDir()).path
-        metadata = self.factory.make_metadata()
-        debemail = 'Dude <[e-mail]>'
-        with patch_settings(PKGME_MAINTAINER_EMAIL=debemail):
-            output_tar_path = self.run_task(
-                metadata, self.factory.make_packagable_tarball())
-        output_tar = tarfile.open(output_tar_path, 'r:gz')
-        try:
-            output_tar.extractall(unpack_dir)
-        finally:
-            output_tar.close()
-        package_name = metadata['package_name']
-        package_tarball_path = os.path.join(
-            unpack_dir, '%s_0.tar.gz' % (package_name,))
-        t = tarfile.open(package_tarball_path)
-        try:
-            t.extractall(unpack_dir)
-        finally:
-            t.close()
-        debian_dir = os.path.join(unpack_dir, package_name, 'debian')
-        changelog_path = os.path.join(debian_dir, 'changelog')
-        cl = changelog.Changelog(open(changelog_path).read())
-        [change_block] = list(cl)
-        self.assertEqual(debemail, change_block.author)

=== modified file 'tarmac_tests.sh'
--- tarmac_tests.sh	2012-01-23 22:20:10 +0000
+++ tarmac_tests.sh	2012-07-13 08:21:21 +0000
@@ -5,3 +5,4 @@
 fab bootstrap > log
 . ./virtualenv/bin/activate >> log
 fab test
+fab bigtests

=== modified file 'test-dependencies.txt'
--- test-dependencies.txt	2012-04-26 12:02:00 +0000
+++ test-dependencies.txt	2012-07-13 08:21:21 +0000
@@ -1,9 +1,13 @@
 coverage
+discover
 django-kombu
 mock==0.8
 piston-mini-client==0.3
 testtools
 twisted
+juju
+zc-zookeeper-static
+pyyaml
 # These aren't test requirements, but we want to fetch these dependencies from
 # bzr and this is the only way I can figure out how to do this -- jml
 -e bzr+ssh://bazaar.launchpad.net/+branch/pkgme#egg=pkgme