← Back to branch summary

~lamont/maas/bug-1599223-2.0

« back to all changes in this revision

Viewing changes to src/maasserver/utils/tests/test_orm.py

  • Committer: LaMont Jones
  • Date: 2016-05-12 19:07:37 UTC
  • mfrom: (5017 maas)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: lamont@canonical.com-20160512190737-00g34satnuo0tk8v
merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/utils/tests/test_orm.py
11
11
)
12
12
from random import randint
13
13
import time
 
14
from unittest.mock import (
 
15
    ANY,
 
16
    call,
 
17
    Mock,
 
18
    sentinel,
 
19
)
14
20
 
15
21
from django.core.exceptions import MultipleObjectsReturned
16
22
from django.db import (
66
72
    MockNotCalled,
67
73
)
68
74
from maastesting.testcase import MAASTestCase
69
 
from mock import (
70
 
    ANY,
71
 
    call,
72
 
    Mock,
73
 
    sentinel,
74
 
)
 
75
from maastesting.twisted import extract_result
75
76
from provisioningserver.utils.twisted import (
76
77
    callOut,
77
78
    DeferredValue,
82
83
    SERIALIZATION_FAILURE,
83
84
)
84
85
from testtools import ExpectedException
85
 
from testtools.deferredruntest import extract_result
86
86
from testtools.matchers import (
87
87
    AllMatch,
88
88
    Equals,