~lamont/maas/bug-1599223-2.0

« back to all changes in this revision

Viewing changes to src/provisioningserver/rpc/tests/test_dhcp.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:
7
7
 
8
8
import copy
9
9
from operator import itemgetter
 
10
from unittest.mock import (
 
11
    ANY,
 
12
    call,
 
13
    Mock,
 
14
    sentinel,
 
15
)
10
16
 
11
17
from fixtures import FakeLogger
12
18
from maastesting.factory import factory
19
25
    MAASTestCase,
20
26
    MAASTwistedRunTest,
21
27
)
22
 
from mock import (
23
 
    ANY,
24
 
    call,
25
 
    Mock,
26
 
    sentinel,
27
 
)
28
28
from provisioningserver.dhcp.testing.config import (
29
29
    make_dhcp_snippets,
30
30
    make_failover_peer_config,