~allenap/maas/xxx-a-thon

« back to all changes in this revision

Viewing changes to src/maasserver/testing/tests/test_module.py

  • Committer: Gavin Panella
  • Date: 2016-03-22 21:14:34 UTC
  • mfrom: (4657.1.157 maas)
  • Revision ID: gavin.panella@canonical.com-20160322211434-xzuovio86zvzo2js
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
    NoReceivers,
22
22
)
23
23
from maasserver.testing.factory import factory
24
 
from maasserver.testing.orm import (
25
 
    reload_object,
26
 
    reload_objects,
27
 
)
 
24
from maasserver.testing.orm import reload_objects
28
25
from maasserver.testing.testcase import MAASServerTestCase
 
26
from maasserver.utils.orm import reload_object
29
27
from testtools.matchers import Equals
30
28
 
31
29