MAAS

Merge lp:~jtv/maas/refresh-random-factory-renamings into lp:~maas-committers/maas/trunk

  1. refresh-random-factory-renamings
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 3037
Proposed branch: lp:~jtv/maas/refresh-random-factory-renamings
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 69 lines (+6/-6)
4 files modified
src/maasserver/rpc/tests/test_regionservice.py (+2/-2)
src/maasserver/utils/tests/test_utils.py (+1/-1)
src/provisioningserver/tests/test_events.py (+2/-2)
src/provisioningserver/utils/tests/test_network.py (+1/-1)
To merge this branch: bzr merge lp:~jtv/maas/refresh-random-factory-renamings
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+235263@code.launchpad.net

Commit message

“Refresh” the getRandom* factory renamings: change some old-style calls that were still, or newly landed, in the codebase to the new factory naming style.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
2--- src/maasserver/rpc/tests/test_regionservice.py 2014-09-19 04:31:43 +0000
3+++ src/maasserver/rpc/tests/test_regionservice.py 2014-09-19 10:16:19 +0000
4@@ -819,7 +819,7 @@
5 @wait_for_reactor
6 def test_create_node_raises_if_unknown_type(self):
7 name = factory.make_name('type_name')
8- mac_address = factory.getRandomMACAddress()
9+ mac_address = factory.make_mac_address()
10 description = factory.make_name('description')
11
12 d = call_responder(
13@@ -844,7 +844,7 @@
14 level = random.randint(0, 100)
15 yield deferToThread(self.create_event_type, name, description, level)
16
17- mac_address = factory.getRandomMACAddress()
18+ mac_address = factory.make_mac_address()
19 event_description = factory.make_name('event-description')
20 d = call_responder(
21 Region(), SendEventMACAddress,
22
23=== modified file 'src/maasserver/utils/tests/test_utils.py'
24--- src/maasserver/utils/tests/test_utils.py 2014-09-19 03:12:47 +0000
25+++ src/maasserver/utils/tests/test_utils.py 2014-09-19 10:16:19 +0000
26@@ -188,7 +188,7 @@
27 class TestFindNodegroup(MAASServerTestCase):
28
29 scenarios = [
30- ('ipv4', {'network_factory': factory.getRandomNetwork}),
31+ ('ipv4', {'network_factory': factory.make_ipv4_network}),
32 ('ipv6', {'network_factory': factory.make_ipv6_network}),
33 ]
34
35
36=== modified file 'src/provisioningserver/tests/test_events.py'
37--- src/provisioningserver/tests/test_events.py 2014-09-18 03:15:07 +0000
38+++ src/provisioningserver/tests/test_events.py 2014-09-19 10:16:19 +0000
39@@ -135,7 +135,7 @@
40 protocol, connecting = self.patch_rpc_methods()
41 self.addCleanup((yield connecting))
42
43- mac_address = factory.getRandomMACAddress()
44+ mac_address = factory.make_mac_address()
45 description = factory.make_name('description')
46 event_name = random.choice(map_enum(EVENT_TYPES).keys())
47
48@@ -155,7 +155,7 @@
49 side_effect=[NoSuchEventType, {}])
50 self.addCleanup((yield connecting))
51
52- mac_address = factory.getRandomMACAddress()
53+ mac_address = factory.make_mac_address()
54 description = factory.make_name('description')
55 event_name = random.choice(map_enum(EVENT_TYPES).keys())
56
57
58=== modified file 'src/provisioningserver/utils/tests/test_network.py'
59--- src/provisioningserver/utils/tests/test_network.py 2014-09-18 12:44:38 +0000
60+++ src/provisioningserver/utils/tests/test_network.py 2014-09-19 10:16:19 +0000
61@@ -219,7 +219,7 @@
62 scenarios = [
63 ('ipv4', {
64 'inet_class': AF_INET,
65- 'network_factory': factory.getRandomNetwork,
66+ 'network_factory': factory.make_ipv4_network,
67 'ip_address_factory': factory.make_ipv4_address,
68 'loopback_address': '127.0.0.1',
69 }),