~allenap/maas/xxx-a-thon

« back to all changes in this revision

Viewing changes to src/maasserver/api/tests/test_dnsresources.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:
15
15
from maasserver.models.dnsresource import DNSResource
16
16
from maasserver.testing.api import APITestCase
17
17
from maasserver.testing.factory import factory
18
 
from maasserver.testing.orm import reload_object
 
18
from maasserver.utils.orm import reload_object
19
19
from testtools.matchers import (
20
20
    ContainsDict,
21
21
    Equals,