← Back to branch summary

~ubuntu-branches/ubuntu/raring/maas/raring-updates

« back to all changes in this revision

Viewing changes to src/maasserver/tests/test_maasavahi.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2012-07-03 17:42:37 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20120703174237-p8l0keuuznfg721k
Tags: 0.1+bzr709+dfsg-0ubuntu1
* New Upstream release
* debian/control:
  - Depends on python-celery, python-tempita, libjs-yui3-{full,min},
    libjs-raphael
* debian/maas.install:
  - Install apiclient, celeryconfig.py, maas-import-pxe-files, preseeds_v2.
  - Update to install various files from chroot, rather tha manually copy
    them from the source.
* debian/maas.links: symlink celeryconfig.py
* debian/maas.maas-celery.upstart: Add job.
* debian/rules:
  - Install celery upstart job.
  - Do not install jslibs as packages are now used.
  - Drop copying of maas_local_settings_sample.py as source now ships
    a maas_local_settings.py
* debian/patches:
  - 04-maas-http-fix.patch: Drop. Merged upstream.
  - 01-fix-database-settings.patch: Refreshed.
  - 99_enums_js.patch: Added until creation of enum.js / build process
    is fixed.
* debian/maas.postinst: Update bzr version to correctly handle upgrades.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/tests/test_maasavahi.py
19
19
    MAASAvahiService,
20
20
    setup_maas_avahi_service,
21
21
    )
22
 
from maasserver.models import (
23
 
    Config,
24
 
    config_manager,
25
 
    )
26
 
from maastesting.testcase import TestCase
 
22
from maasserver.models import Config
 
23
from maastesting.djangotestcase import DjangoTestCase
27
24
 
28
25
 
29
26
class MockZeroconfServiceFactory:
58
55
        self.calls.append('unpublish')
59
56
 
60
57
 
61
 
class TestMAASAvahiService(TestCase):
 
58
class TestMAASAvahiService(DjangoTestCase):
62
59
 
63
60
    def setup_mock_avahi(self):
64
61
        # Unregister other signals from Config, otherwise
65
62
        # the one registered in urls.py, will interfere with these tests
66
63
        self.patch(
67
 
            config_manager, '_config_changed_connections', defaultdict(set))
 
64
            Config.objects, '_config_changed_connections', defaultdict(set))
68
65
 
69
66
        mock_avahi = MockZeroconfServiceFactory()
70
67
        self.patch(