MAAS

Merge ~adam-collard/maas:trigger-speedups into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. trigger-speedups
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 253541567c5d678620c94bb4a649a8d501647a0d
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:trigger-speedups
Merge into: maas:master
Diff against target: 3062 lines (+186/-377)
1 file modified
src/maasserver/triggers/tests/test_websocket_listener.py (+186/-377)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Review via email: mp+409042@code.launchpad.net

Commit message

[tests/websockets] Do not re-register triggers

Triggers are registered across the whole test suite via maasserver.testing.resources.DjangoPristineDatabaseManager.

Add some missing asserts, use str(...) instead of "%s" % ...

Description of the change

On my machine this speeds up bin/test.parallel src/maasserver/triggers/tests/test_websocket_listener.py from 50s to 27s

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

nice cleanup!

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b trigger-speedups lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11076/consoleText

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/triggers/tests/test_websocket_listener.py b/src/maasserver/triggers/tests/test_websocket_listener.py
2index cfa0a01..f9c8139 100644
3--- a/src/maasserver/triggers/tests/test_websocket_listener.py
4+++ b/src/maasserver/triggers/tests/test_websocket_listener.py
5@@ -38,10 +38,7 @@ from maasserver.testing.factory import factory
6 from maasserver.testing.fixtures import UserSkipCreateAuthorisationTokenFixture
7 from maasserver.testing.testcase import MAASTransactionServerTestCase
8 from maasserver.triggers.testing import TransactionalHelpersMixin
9-from maasserver.triggers.websocket import (
10- node_fields,
11- register_websocket_triggers,
12-)
13+from maasserver.triggers.websocket import node_fields
14 from maasserver.utils.orm import transactional
15 from maasserver.utils.threads import deferToDatabase
16 from metadataserver.builtin_scripts import load_builtin_scripts
17@@ -147,7 +144,6 @@ class TestNodeListener(
18 @wait_for_reactor
19 @inlineCallbacks
20 def test_calls_handler_on_create_notification(self):
21- yield deferToDatabase(register_websocket_triggers)
22 listener = self.make_listener_without_delay()
23 dv = DeferredValue()
24 listener.register(self.listener, lambda *args: dv.set(args))
25@@ -162,7 +158,6 @@ class TestNodeListener(
26 @wait_for_reactor
27 @inlineCallbacks
28 def test_calls_handler_on_update_notification(self):
29- yield deferToDatabase(register_websocket_triggers)
30 listener = self.make_listener_without_delay()
31 dv = DeferredValue()
32 listener.register(self.listener, lambda *args: dv.set(args))
33@@ -182,7 +177,6 @@ class TestNodeListener(
34 @wait_for_reactor
35 @inlineCallbacks
36 def test_calls_handler_on_description_update(self):
37- yield deferToDatabase(register_websocket_triggers)
38 listener = self.make_listener_without_delay()
39 dv = DeferredValue()
40 listener.register(self.listener, lambda *args: dv.set(args))
41@@ -202,7 +196,6 @@ class TestNodeListener(
42 @wait_for_reactor
43 @inlineCallbacks
44 def test_calls_handler_on_delete_notification(self):
45- yield deferToDatabase(register_websocket_triggers)
46 listener = self.make_listener_without_delay()
47 dv = DeferredValue()
48 listener.register(self.listener, lambda *args: dv.set(args))
49@@ -218,7 +211,6 @@ class TestNodeListener(
50 @wait_for_reactor
51 @inlineCallbacks
52 def test_calls_handler_on_domain_name_change(self):
53- yield deferToDatabase(register_websocket_triggers)
54 listener = self.make_listener_without_delay()
55 dv = DeferredValue()
56 domain = yield deferToDatabase(self.create_domain, {})
57@@ -240,7 +232,6 @@ class TestNodeListener(
58 @wait_for_reactor
59 @inlineCallbacks
60 def test_calls_all_handler_on_domain_name_change(self):
61- yield deferToDatabase(register_websocket_triggers)
62 listener = self.make_listener_without_delay()
63 dvs = DeferredValue()
64 domain = yield deferToDatabase(self.create_domain, {})
65@@ -265,7 +256,7 @@ class TestNodeListener(
66 (dv.get(timeout=2) for dv in save_dvs)
67 )
68 self.assertCountEqual(
69- {("update", "%s" % node.system_id) for node in nodes},
70+ {("update", node.system_id) for node in nodes},
71 {res for (suc, res) in results},
72 )
73 finally:
74@@ -317,13 +308,9 @@ class TestControllerListener(
75 def set_versions_info(self, controller, versions_info):
76 ControllerInfo.objects.set_versions_info(controller, versions_info)
77
78- def delete_controllerinfo(self, controller):
79- ControllerInfo.objects.filter(node=controller).delete()
80-
81 @wait_for_reactor
82 @inlineCallbacks
83 def test_calls_handler_on_controllerinfo_insert(self):
84- yield deferToDatabase(register_websocket_triggers)
85 listener = self.make_listener_without_delay()
86 dv = DeferredValue()
87 controller = yield deferToDatabase(self.create_node, self.params)
88@@ -332,13 +319,13 @@ class TestControllerListener(
89 try:
90 yield deferToDatabase(self.set_version, controller, "2.10.0")
91 yield dv.get(timeout=2)
92+ self.assertEqual(("update", controller.system_id), dv.value)
93 finally:
94 yield listener.stopService()
95
96 @wait_for_reactor
97 @inlineCallbacks
98 def test_calls_handler_on_controllerinfo_version_update(self):
99- yield deferToDatabase(register_websocket_triggers)
100 listener = self.make_listener_without_delay()
101 dv = DeferredValue()
102 controller = yield deferToDatabase(self.create_node, self.params)
103@@ -348,13 +335,13 @@ class TestControllerListener(
104 try:
105 yield deferToDatabase(self.set_version, controller, "2.10.1")
106 yield dv.get(timeout=2)
107+ self.assertEqual(("update", controller.system_id), dv.value)
108 finally:
109 yield listener.stopService()
110
111 @wait_for_reactor
112 @inlineCallbacks
113 def test_calls_handler_on_controllerinfo_versionsinfo_update(self):
114- yield deferToDatabase(register_websocket_triggers)
115 listener = self.make_listener_without_delay()
116 dv = DeferredValue()
117 controller = yield deferToDatabase(self.create_node, self.params)
118@@ -372,13 +359,13 @@ class TestControllerListener(
119 ),
120 )
121 yield dv.get(timeout=2)
122+ self.assertEqual(("update", controller.system_id), dv.value)
123 finally:
124 yield listener.stopService()
125
126 @wait_for_reactor
127 @inlineCallbacks
128 def test_calls_handler_on_controllerinfo_delete(self):
129- yield deferToDatabase(register_websocket_triggers)
130 listener = self.make_listener_without_delay()
131 dv = DeferredValue()
132 controller = yield deferToDatabase(self.create_node, self.params)
133@@ -386,8 +373,9 @@ class TestControllerListener(
134 listener.register(self.listener, lambda *args: dv.set(args))
135 yield listener.startService()
136 try:
137- yield deferToDatabase(self.delete_controllerinfo, controller)
138+ yield deferToDatabase(controller.controllerinfo.delete)
139 yield dv.get(timeout=2)
140+ self.assertEqual(("update", controller.system_id), dv.value)
141 finally:
142 yield listener.stopService()
143
144@@ -400,7 +388,6 @@ class TestDeviceWithParentListener(
145 @wait_for_reactor
146 @inlineCallbacks
147 def test_calls_handler_on_create_notification(self):
148- yield deferToDatabase(register_websocket_triggers)
149 listener = self.make_listener_without_delay()
150 dv = DeferredValue()
151 listener.register("machine", lambda *args: dv.set(args))
152@@ -419,7 +406,6 @@ class TestDeviceWithParentListener(
153 @wait_for_reactor
154 @inlineCallbacks
155 def test_calls_handler_on_update_notification(self):
156- yield deferToDatabase(register_websocket_triggers)
157 listener = self.make_listener_without_delay()
158 dv = DeferredValue()
159 listener.register("machine", lambda *args: dv.set(args))
160@@ -439,7 +425,6 @@ class TestDeviceWithParentListener(
161 @wait_for_reactor
162 @inlineCallbacks
163 def test_calls_handler_on_delete_notification(self):
164- yield deferToDatabase(register_websocket_triggers)
165 listener = self.make_listener_without_delay()
166 dv = DeferredValue()
167 listener.register("machine", lambda *args: dv.set(args))
168@@ -462,7 +447,6 @@ class TestZoneListener(
169 @wait_for_reactor
170 @inlineCallbacks
171 def test_calls_handler_on_create_notification(self):
172- yield deferToDatabase(register_websocket_triggers)
173 listener = self.make_listener_without_delay()
174 dv = DeferredValue()
175 listener.register("zone", lambda *args: dv.set(args))
176@@ -470,14 +454,13 @@ class TestZoneListener(
177 try:
178 zone = yield deferToDatabase(self.create_zone)
179 yield dv.get(timeout=2)
180- self.assertEqual(("create", "%s" % zone.id), dv.value)
181+ self.assertEqual(("create", str(zone.id)), dv.value)
182 finally:
183 yield listener.stopService()
184
185 @wait_for_reactor
186 @inlineCallbacks
187 def test_calls_handler_on_update_notification(self):
188- yield deferToDatabase(register_websocket_triggers)
189 listener = self.make_listener_without_delay()
190 dv = DeferredValue()
191 listener.register("zone", lambda *args: dv.set(args))
192@@ -491,14 +474,13 @@ class TestZoneListener(
193 {"description": factory.make_name("description")},
194 )
195 yield dv.get(timeout=2)
196- self.assertEqual(("update", "%s" % zone.id), dv.value)
197+ self.assertEqual(("update", str(zone.id)), dv.value)
198 finally:
199 yield listener.stopService()
200
201 @wait_for_reactor
202 @inlineCallbacks
203 def test_calls_handler_on_delete_notification(self):
204- yield deferToDatabase(register_websocket_triggers)
205 listener = self.make_listener_without_delay()
206 dv = DeferredValue()
207 listener.register("zone", lambda *args: dv.set(args))
208@@ -507,7 +489,7 @@ class TestZoneListener(
209 try:
210 yield deferToDatabase(self.delete_zone, zone.id)
211 yield dv.get(timeout=2)
212- self.assertEqual(("delete", "%s" % zone.id), dv.value)
213+ self.assertEqual(("delete", str(zone.id)), dv.value)
214 finally:
215 yield listener.stopService()
216
217@@ -521,7 +503,6 @@ class TestResourcePoolListener(
218 @wait_for_reactor
219 @inlineCallbacks
220 def test_calls_handler_on_create_notification(self):
221- yield deferToDatabase(register_websocket_triggers)
222 listener = self.make_listener_without_delay()
223 dv = DeferredValue()
224 listener.register("resourcepool", lambda *args: dv.set(args))
225@@ -529,14 +510,13 @@ class TestResourcePoolListener(
226 try:
227 pool = yield deferToDatabase(self.create_resource_pool)
228 yield dv.get(timeout=2)
229- self.assertEqual(("create", "%s" % pool.id), dv.value)
230+ self.assertEqual(("create", str(pool.id)), dv.value)
231 finally:
232 yield listener.stopService()
233
234 @wait_for_reactor
235 @inlineCallbacks
236 def test_calls_handler_on_update_notification(self):
237- yield deferToDatabase(register_websocket_triggers)
238 listener = self.make_listener_without_delay()
239 dv = DeferredValue()
240 listener.register("resourcepool", lambda *args: dv.set(args))
241@@ -550,14 +530,13 @@ class TestResourcePoolListener(
242 {"description": factory.make_name("description")},
243 )
244 yield dv.get(timeout=2)
245- self.assertEqual(("update", "%s" % pool.id), dv.value)
246+ self.assertEqual(("update", str(pool.id)), dv.value)
247 finally:
248 yield listener.stopService()
249
250 @wait_for_reactor
251 @inlineCallbacks
252 def test_calls_handler_on_delete_notification(self):
253- yield deferToDatabase(register_websocket_triggers)
254 listener = self.make_listener_without_delay()
255 dv = DeferredValue()
256 listener.register("resourcepool", lambda *args: dv.set(args))
257@@ -566,14 +545,13 @@ class TestResourcePoolListener(
258 try:
259 yield deferToDatabase(self.delete_resource_pool, pool.id)
260 yield dv.get(timeout=2)
261- self.assertEqual(("delete", "%s" % pool.id), dv.value)
262+ self.assertEqual(("delete", str(pool.id)), dv.value)
263 finally:
264 yield listener.stopService()
265
266 @wait_for_reactor
267 @inlineCallbacks
268 def test_calls_handler_on_create_machine(self):
269- yield deferToDatabase(register_websocket_triggers)
270 listener = self.make_listener_without_delay()
271 dv = DeferredValue()
272 listener.register("resourcepool", lambda *args: dv.set(args))
273@@ -585,14 +563,13 @@ class TestResourcePoolListener(
274 {"node_type": NODE_TYPE.MACHINE, "pool": pool},
275 )
276 yield dv.get(timeout=2)
277- self.assertEqual(("update", "%s" % pool.id), dv.value)
278+ self.assertEqual(("update", str(pool.id)), dv.value)
279 finally:
280 yield listener.stopService()
281
282 @wait_for_reactor
283 @inlineCallbacks
284 def test_no_calls_handler_on_create_device(self):
285- yield deferToDatabase(register_websocket_triggers)
286 listener = self.make_listener_without_delay()
287 dv = DeferredValue()
288 listener.register("resourcepool", lambda *args: dv.set(args))
289@@ -609,7 +586,6 @@ class TestResourcePoolListener(
290 @wait_for_reactor
291 @inlineCallbacks
292 def test_calls_handler_on_delete_machine(self):
293- yield deferToDatabase(register_websocket_triggers)
294 listener = self.make_listener_without_delay()
295 dv = DeferredValue()
296 listener.register("resourcepool", lambda *args: dv.set(args))
297@@ -621,14 +597,13 @@ class TestResourcePoolListener(
298 try:
299 yield deferToDatabase(self.delete_node, node.system_id)
300 yield dv.get(timeout=2)
301- self.assertEqual(("update", "%s" % pool.id), dv.value)
302+ self.assertEqual(("update", str(pool.id)), dv.value)
303 finally:
304 yield listener.stopService()
305
306 @wait_for_reactor
307 @inlineCallbacks
308 def test_no_calls_handler_on_delete_device(self):
309- yield deferToDatabase(register_websocket_triggers)
310 listener = self.make_listener_without_delay()
311 dv = DeferredValue()
312 listener.register("resourcepool", lambda *args: dv.set(args))
313@@ -646,7 +621,6 @@ class TestResourcePoolListener(
314 @wait_for_reactor
315 @inlineCallbacks
316 def test_calls_handler_on_update_machine_pool(self):
317- yield deferToDatabase(register_websocket_triggers)
318 listener = self.make_listener_without_delay()
319 dvs = dv1, dv2 = [DeferredValue(), DeferredValue()]
320 listener.register("resourcepool", lambda *args: dvs.pop(0).set(args))
321@@ -664,15 +638,14 @@ class TestResourcePoolListener(
322 yield dv2.get(timeout=2)
323 values = sorted([dv1.value, dv2.value])
324 pool_ids = sorted(str(pool.id) for pool in [pool1, pool2])
325- self.assertEqual(("update", "%s" % pool_ids[0]), values[0])
326- self.assertEqual(("update", "%s" % pool_ids[1]), values[1])
327+ self.assertEqual(("update", str(pool_ids[0])), values[0])
328+ self.assertEqual(("update", str(pool_ids[1])), values[1])
329 finally:
330 yield listener.stopService()
331
332 @wait_for_reactor
333 @inlineCallbacks
334 def test_calls_handler_on_update_machine_status_to_ready(self):
335- yield deferToDatabase(register_websocket_triggers)
336 listener = self.make_listener_without_delay()
337 dv = DeferredValue()
338 listener.register("resourcepool", lambda *args: dv.set(args))
339@@ -695,14 +668,13 @@ class TestResourcePoolListener(
340 self.update_node, node.system_id, {"status": NODE_STATUS.READY}
341 )
342 yield dv.get(timeout=2)
343- self.assertEqual(("update", "%s" % pool.id), dv.value)
344+ self.assertEqual(("update", str(pool.id)), dv.value)
345 finally:
346 yield listener.stopService()
347
348 @wait_for_reactor
349 @inlineCallbacks
350 def test_calls_handler_on_update_machine_status_from_ready(self):
351- yield deferToDatabase(register_websocket_triggers)
352 listener = self.make_listener_without_delay()
353 dv = DeferredValue()
354 listener.register("resourcepool", lambda *args: dv.set(args))
355@@ -723,14 +695,13 @@ class TestResourcePoolListener(
356 {"status": NODE_STATUS.COMMISSIONING},
357 )
358 yield dv.get(timeout=2)
359- self.assertEqual(("update", "%s" % pool.id), dv.value)
360+ self.assertEqual(("update", str(pool.id)), dv.value)
361 finally:
362 yield listener.stopService()
363
364 @wait_for_reactor
365 @inlineCallbacks
366 def test_calls_handler_on_update_machine_node_type_to_machine(self):
367- yield deferToDatabase(register_websocket_triggers)
368 listener = self.make_listener_without_delay()
369 dv = DeferredValue()
370 listener.register("resourcepool", lambda *args: dv.set(args))
371@@ -753,14 +724,13 @@ class TestResourcePoolListener(
372 {"node_type": NODE_TYPE.MACHINE, "pool": pool},
373 )
374 yield dv.get(timeout=2)
375- self.assertEqual(("update", "%s" % pool.id), dv.value)
376+ self.assertEqual(("update", str(pool.id)), dv.value)
377 finally:
378 yield listener.stopService()
379
380 @wait_for_reactor
381 @inlineCallbacks
382 def test_calls_handler_on_update_machine_node_type_from_machine(self):
383- yield deferToDatabase(register_websocket_triggers)
384 listener = self.make_listener_without_delay()
385 dv = DeferredValue()
386 listener.register("resourcepool", lambda *args: dv.set(args))
387@@ -784,7 +754,7 @@ class TestResourcePoolListener(
388 {"node_type": new_node_type, "pool_id": None},
389 )
390 yield dv.get(timeout=2)
391- self.assertEqual(("update", "%s" % pool.id), dv.value)
392+ self.assertEqual(("update", str(pool.id)), dv.value)
393 finally:
394 yield listener.stopService()
395
396@@ -798,7 +768,6 @@ class TestTagListener(
397 @wait_for_reactor
398 @inlineCallbacks
399 def test_calls_handler_on_create_notification(self):
400- yield deferToDatabase(register_websocket_triggers)
401 listener = self.make_listener_without_delay()
402 dv = DeferredValue()
403 listener.register("tag", lambda *args: dv.set(args))
404@@ -806,14 +775,13 @@ class TestTagListener(
405 try:
406 tag = yield deferToDatabase(self.create_tag)
407 yield dv.get(timeout=2)
408- self.assertEqual(("create", "%s" % tag.id), dv.value)
409+ self.assertEqual(("create", str(tag.id)), dv.value)
410 finally:
411 yield listener.stopService()
412
413 @wait_for_reactor
414 @inlineCallbacks
415 def test_calls_handler_on_update_notification(self):
416- yield deferToDatabase(register_websocket_triggers)
417 listener = self.make_listener_without_delay()
418 dv = DeferredValue()
419 listener.register("tag", lambda *args: dv.set(args))
420@@ -825,14 +793,13 @@ class TestTagListener(
421 self.update_tag, tag.id, {"name": factory.make_name("tag")}
422 )
423 yield dv.get(timeout=2)
424- self.assertEqual(("update", "%s" % tag.id), dv.value)
425+ self.assertEqual(("update", str(tag.id)), dv.value)
426 finally:
427 yield listener.stopService()
428
429 @wait_for_reactor
430 @inlineCallbacks
431 def test_calls_handler_on_delete_notification(self):
432- yield deferToDatabase(register_websocket_triggers)
433 listener = self.make_listener_without_delay()
434 dv = DeferredValue()
435 listener.register("tag", lambda *args: dv.set(args))
436@@ -841,7 +808,7 @@ class TestTagListener(
437 try:
438 yield deferToDatabase(self.delete_tag, tag.id)
439 yield dv.get(timeout=2)
440- self.assertEqual(("delete", "%s" % tag.id), dv.value)
441+ self.assertEqual(("delete", str(tag.id)), dv.value)
442 finally:
443 yield listener.stopService()
444
445@@ -890,7 +857,6 @@ class TestNodeTagListener(
446 @wait_for_reactor
447 @inlineCallbacks
448 def test_calls_handler_with_update_on_create(self):
449- yield deferToDatabase(register_websocket_triggers)
450 node = yield deferToDatabase(self.create_node, self.params)
451 tag = yield deferToDatabase(self.create_tag)
452
453@@ -901,14 +867,13 @@ class TestNodeTagListener(
454 try:
455 yield deferToDatabase(self.add_node_to_tag, node, tag)
456 yield dv.get(timeout=2)
457- self.assertEqual(("update", "%s" % node.system_id), dv.value)
458+ self.assertEqual(("update", node.system_id), dv.value)
459 finally:
460 yield listener.stopService()
461
462 @wait_for_reactor
463 @inlineCallbacks
464 def test_calls_handler_with_update_on_delete(self):
465- yield deferToDatabase(register_websocket_triggers)
466 node = yield deferToDatabase(self.create_node, self.params)
467 tag = yield deferToDatabase(self.create_tag)
468 yield deferToDatabase(self.add_node_to_tag, node, tag)
469@@ -920,14 +885,13 @@ class TestNodeTagListener(
470 try:
471 yield deferToDatabase(self.remove_node_from_tag, node, tag)
472 yield dv.get(timeout=2)
473- self.assertEqual(("update", "%s" % node.system_id), dv.value)
474+ self.assertEqual(("update", node.system_id), dv.value)
475 finally:
476 yield listener.stopService()
477
478 @wait_for_reactor
479 @inlineCallbacks
480 def test_calls_node_handler_with_update_on_tag_rename(self):
481- yield deferToDatabase(register_websocket_triggers)
482 node = yield deferToDatabase(self.create_node, self.params)
483 tag = yield deferToDatabase(self.create_tag)
484 yield deferToDatabase(self.add_node_to_tag, node, tag)
485@@ -941,7 +905,7 @@ class TestNodeTagListener(
486 self.update_tag, tag.id, {"name": factory.make_name("tag")}
487 )
488 yield dv.get(timeout=2)
489- self.assertEqual(("update", "%s" % node.system_id), dv.value)
490+ self.assertEqual(("update", node.system_id), dv.value)
491 finally:
492 yield listener.stopService()
493
494@@ -988,7 +952,6 @@ class TestOwnerDataTriggers(
495 @wait_for_reactor
496 @inlineCallbacks
497 def test_calls_handler_with_update_on_create(self):
498- yield deferToDatabase(register_websocket_triggers)
499 node = yield deferToDatabase(self.create_node, self.params)
500
501 listener = self.make_listener_without_delay()
502@@ -1007,7 +970,6 @@ class TestOwnerDataTriggers(
503 @wait_for_reactor
504 @inlineCallbacks
505 def test_calls_handler_with_update_on_update(self):
506- yield deferToDatabase(register_websocket_triggers)
507 node = yield deferToDatabase(self.create_node, self.params)
508
509 listener = self.make_listener_without_delay()
510@@ -1029,7 +991,6 @@ class TestOwnerDataTriggers(
511 @wait_for_reactor
512 @inlineCallbacks
513 def test_calls_handler_with_update_on_replace(self):
514- yield deferToDatabase(register_websocket_triggers)
515 node = yield deferToDatabase(self.create_node, self.params)
516
517 listener = self.make_listener_without_delay()
518@@ -1093,7 +1054,6 @@ class TestNodeMetadataTriggers(
519 @wait_for_reactor
520 @inlineCallbacks
521 def test_calls_handler_with_update_on_create(self):
522- yield deferToDatabase(register_websocket_triggers)
523 node = yield deferToDatabase(self.create_node, self.params)
524
525 listener = self.make_listener_without_delay()
526@@ -1103,14 +1063,13 @@ class TestNodeMetadataTriggers(
527 try:
528 yield deferToDatabase(self.set_node_metadata, node, "foo", "bar")
529 yield dv.get(timeout=2)
530- self.assertEqual(("update", "%s" % node.system_id), dv.value)
531+ self.assertEqual(("update", node.system_id), dv.value)
532 finally:
533 yield listener.stopService()
534
535 @wait_for_reactor
536 @inlineCallbacks
537 def test_calls_handler_with_update_on_update(self):
538- yield deferToDatabase(register_websocket_triggers)
539 node = yield deferToDatabase(self.create_node, self.params)
540
541 listener = self.make_listener_without_delay()
542@@ -1121,14 +1080,13 @@ class TestNodeMetadataTriggers(
543 try:
544 yield deferToDatabase(self.set_node_metadata, node, "foo", "baz")
545 yield dv.get(timeout=2)
546- self.assertEqual(("update", "%s" % node.system_id), dv.value)
547+ self.assertEqual(("update", node.system_id), dv.value)
548 finally:
549 yield listener.stopService()
550
551 @wait_for_reactor
552 @inlineCallbacks
553 def test_calls_handler_with_update_on_delete(self):
554- yield deferToDatabase(register_websocket_triggers)
555 node = yield deferToDatabase(self.create_node, self.params)
556
557 listener = self.make_listener_without_delay()
558@@ -1139,7 +1097,7 @@ class TestNodeMetadataTriggers(
559 try:
560 yield deferToDatabase(self.delete_node_metadata, node, "foo")
561 yield dv.get(timeout=2)
562- self.assertEqual(("update", "%s" % node.system_id), dv.value)
563+ self.assertEqual(("update", node.system_id), dv.value)
564 finally:
565 yield listener.stopService()
566
567@@ -1153,7 +1111,6 @@ class TestDeviceWithParentTagListener(
568 @wait_for_reactor
569 @inlineCallbacks
570 def test_calls_handler_with_update_on_create(self):
571- yield deferToDatabase(register_websocket_triggers)
572 device, parent = yield deferToDatabase(self.create_device_with_parent)
573 tag = yield deferToDatabase(self.create_tag)
574
575@@ -1164,14 +1121,13 @@ class TestDeviceWithParentTagListener(
576 try:
577 yield deferToDatabase(self.add_node_to_tag, device, tag)
578 yield dv.get(timeout=2)
579- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
580+ self.assertEqual(("update", parent.system_id), dv.value)
581 finally:
582 yield listener.stopService()
583
584 @wait_for_reactor
585 @inlineCallbacks
586 def test_calls_handler_with_update_on_delete(self):
587- yield deferToDatabase(register_websocket_triggers)
588 device, parent = yield deferToDatabase(self.create_device_with_parent)
589 tag = yield deferToDatabase(self.create_tag)
590 yield deferToDatabase(self.add_node_to_tag, device, tag)
591@@ -1183,14 +1139,13 @@ class TestDeviceWithParentTagListener(
592 try:
593 yield deferToDatabase(self.remove_node_from_tag, device, tag)
594 yield dv.get(timeout=2)
595- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
596+ self.assertEqual(("update", parent.system_id), dv.value)
597 finally:
598 yield listener.stopService()
599
600 @wait_for_reactor
601 @inlineCallbacks
602 def test_calls_node_handler_with_update_on_tag_rename(self):
603- yield deferToDatabase(register_websocket_triggers)
604 device, parent = yield deferToDatabase(self.create_device_with_parent)
605 tag = yield deferToDatabase(self.create_tag)
606 yield deferToDatabase(self.add_node_to_tag, device, tag)
607@@ -1204,7 +1159,7 @@ class TestDeviceWithParentTagListener(
608 self.update_tag, tag.id, {"name": factory.make_name("tag")}
609 )
610 yield dv.get(timeout=2)
611- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
612+ self.assertEqual(("update", parent.system_id), dv.value)
613 finally:
614 yield listener.stopService()
615
616@@ -1222,7 +1177,6 @@ class TestUserListener(
617 @wait_for_reactor
618 @inlineCallbacks
619 def test_calls_handler_on_create_notification(self):
620- yield deferToDatabase(register_websocket_triggers)
621 listener = self.make_listener_without_delay()
622 dv = DeferredValue()
623 listener.register("user", lambda *args: dv.set(args))
624@@ -1230,14 +1184,13 @@ class TestUserListener(
625 try:
626 user = yield deferToDatabase(self.create_user)
627 yield dv.get(timeout=2)
628- self.assertEqual(("create", "%s" % user.id), dv.value)
629+ self.assertEqual(("create", str(user.id)), dv.value)
630 finally:
631 yield listener.stopService()
632
633 @wait_for_reactor
634 @inlineCallbacks
635 def test_calls_handler_on_update_notification(self):
636- yield deferToDatabase(register_websocket_triggers)
637 listener = self.make_listener_without_delay()
638 dv = DeferredValue()
639 listener.register("user", lambda *args: dv.set(args))
640@@ -1251,14 +1204,13 @@ class TestUserListener(
641 {"username": factory.make_name("username")},
642 )
643 yield dv.get(timeout=2)
644- self.assertEqual(("update", "%s" % user.id), dv.value)
645+ self.assertEqual(("update", str(user.id)), dv.value)
646 finally:
647 yield listener.stopService()
648
649 @wait_for_reactor
650 @inlineCallbacks
651 def test_calls_handler_on_delete_notification(self):
652- yield deferToDatabase(register_websocket_triggers)
653 listener = self.make_listener_without_delay()
654 user = yield deferToDatabase(self.create_user)
655
656@@ -1268,7 +1220,7 @@ class TestUserListener(
657 try:
658 yield deferToDatabase(self.delete_user, user.id)
659 yield dv.get(timeout=2)
660- self.assertEqual(("delete", "%s" % user.id), dv.value)
661+ self.assertEqual(("delete", str(user.id)), dv.value)
662 finally:
663 yield listener.stopService()
664
665@@ -1282,7 +1234,6 @@ class TestEventListener(
666 @wait_for_reactor
667 @inlineCallbacks
668 def test_calls_handler_on_create_notification(self):
669- yield deferToDatabase(register_websocket_triggers)
670 listener = self.make_listener_without_delay()
671 dv = DeferredValue()
672 listener.register("event", lambda *args: dv.set(args))
673@@ -1290,7 +1241,7 @@ class TestEventListener(
674 try:
675 event = yield deferToDatabase(self.create_event)
676 yield dv.get(timeout=2)
677- self.assertEqual(("create", "%s" % event.id), dv.value)
678+ self.assertEqual(("create", str(event.id)), dv.value)
679 finally:
680 yield listener.stopService()
681
682@@ -1335,7 +1286,6 @@ class TestNodeEventListener(
683 @wait_for_reactor
684 @inlineCallbacks
685 def test_calls_handler_with_update_on_create(self):
686- yield deferToDatabase(register_websocket_triggers)
687 node = yield deferToDatabase(self.create_node, self.params)
688 event_type = yield deferToDatabase(
689 self.create_event_type, {"level": logging.INFO}
690@@ -1350,7 +1300,7 @@ class TestNodeEventListener(
691 self.create_event, {"node": node, "type": event_type}
692 )
693 yield dv.get(timeout=2)
694- self.assertEqual(("update", "%s" % node.system_id), dv.value)
695+ self.assertEqual(("update", node.system_id), dv.value)
696 finally:
697 yield listener.stopService()
698
699@@ -1411,7 +1361,6 @@ class TestNodeStaticIPAddressListener(
700 @wait_for_reactor
701 @inlineCallbacks
702 def test_calls_handler_with_update_on_create(self):
703- yield deferToDatabase(register_websocket_triggers)
704 node = yield deferToDatabase(self.create_node, self.params)
705 interface = yield deferToDatabase(
706 self.get_node_boot_interface, node.system_id
707@@ -1426,14 +1375,13 @@ class TestNodeStaticIPAddressListener(
708 self.create_staticipaddress, {"interface": interface}
709 )
710 yield dv.get(timeout=2)
711- self.assertEqual(("update", "%s" % node.system_id), dv.value)
712+ self.assertEqual(("update", node.system_id), dv.value)
713 finally:
714 yield listener.stopService()
715
716 @wait_for_reactor
717 @inlineCallbacks
718 def test_calls_handler_with_update_on_delete(self):
719- yield deferToDatabase(register_websocket_triggers)
720 node = yield deferToDatabase(self.create_node, self.params)
721 interface = yield deferToDatabase(
722 self.get_node_boot_interface, node.system_id
723@@ -1449,7 +1397,7 @@ class TestNodeStaticIPAddressListener(
724 try:
725 yield deferToDatabase(self.delete_staticipaddress, sip.id)
726 yield dv.get(timeout=2)
727- self.assertEqual(("update", "%s" % node.system_id), dv.value)
728+ self.assertEqual(("update", node.system_id), dv.value)
729 finally:
730 yield listener.stopService()
731
732@@ -1463,7 +1411,6 @@ class TestDeviceWithParentStaticIPAddressListener(
733 @wait_for_reactor
734 @inlineCallbacks
735 def test_calls_handler_with_update_on_create(self):
736- yield deferToDatabase(register_websocket_triggers)
737 device, parent = yield deferToDatabase(
738 self.create_device_with_parent, {"interface": True}
739 )
740@@ -1480,14 +1427,13 @@ class TestDeviceWithParentStaticIPAddressListener(
741 self.create_staticipaddress, {"interface": interface}
742 )
743 yield dv.get(timeout=2)
744- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
745+ self.assertEqual(("update", parent.system_id), dv.value)
746 finally:
747 yield listener.stopService()
748
749 @wait_for_reactor
750 @inlineCallbacks
751 def test_calls_handler_with_update_on_delete(self):
752- yield deferToDatabase(register_websocket_triggers)
753 device, parent = yield deferToDatabase(
754 self.create_device_with_parent, {"interface": True}
755 )
756@@ -1505,7 +1451,7 @@ class TestDeviceWithParentStaticIPAddressListener(
757 try:
758 yield deferToDatabase(self.delete_staticipaddress, sip.id)
759 yield dv.get(timeout=2)
760- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
761+ self.assertEqual(("update", parent.system_id), dv.value)
762 finally:
763 yield listener.stopService()
764
765@@ -1555,7 +1501,6 @@ class TestScriptSetListener(
766 @inlineCallbacks
767 def test_calls_handler_with_update_on_create(self):
768 yield deferToDatabase(load_builtin_scripts)
769- yield deferToDatabase(register_websocket_triggers)
770 node = yield deferToDatabase(self.create_node, self.params)
771
772 listener = self.make_listener_without_delay()
773@@ -1565,7 +1510,7 @@ class TestScriptSetListener(
774 try:
775 yield deferToDatabase(self.create_scriptset, node)
776 yield dv.get(timeout=2)
777- self.assertEqual(("update", "%s" % node.system_id), dv.value)
778+ self.assertEqual(("update", node.system_id), dv.value)
779 finally:
780 yield listener.stopService()
781
782@@ -1573,7 +1518,6 @@ class TestScriptSetListener(
783 @inlineCallbacks
784 def test_calls_handler_with_update_on_delete(self):
785 yield deferToDatabase(load_builtin_scripts)
786- yield deferToDatabase(register_websocket_triggers)
787 node = yield deferToDatabase(self.create_node, self.params)
788 result = yield deferToDatabase(self.create_scriptset, node)
789
790@@ -1584,7 +1528,7 @@ class TestScriptSetListener(
791 try:
792 yield deferToDatabase(self.delete_scriptset, result)
793 yield dv.get(timeout=2)
794- self.assertEqual(("update", "%s" % node.system_id), dv.value)
795+ self.assertEqual(("update", node.system_id), dv.value)
796 finally:
797 yield listener.stopService()
798
799@@ -1599,7 +1543,6 @@ class TestDeviceWithParentScriptSetListener(
800 @inlineCallbacks
801 def test_calls_handler_with_update_on_create(self):
802 yield deferToDatabase(load_builtin_scripts)
803- yield deferToDatabase(register_websocket_triggers)
804 device, parent = yield deferToDatabase(self.create_device_with_parent)
805
806 listener = self.make_listener_without_delay()
807@@ -1609,7 +1552,7 @@ class TestDeviceWithParentScriptSetListener(
808 try:
809 yield deferToDatabase(self.create_scriptset, device)
810 yield dv.get(timeout=2)
811- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
812+ self.assertEqual(("update", parent.system_id), dv.value)
813 finally:
814 yield listener.stopService()
815
816@@ -1617,7 +1560,6 @@ class TestDeviceWithParentScriptSetListener(
817 @inlineCallbacks
818 def test_calls_handler_with_update_on_delete(self):
819 yield deferToDatabase(load_builtin_scripts)
820- yield deferToDatabase(register_websocket_triggers)
821 device, parent = yield deferToDatabase(self.create_device_with_parent)
822 result = yield deferToDatabase(self.create_scriptset, device)
823
824@@ -1628,7 +1570,7 @@ class TestDeviceWithParentScriptSetListener(
825 try:
826 yield deferToDatabase(self.delete_scriptset, result)
827 yield dv.get(timeout=2)
828- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
829+ self.assertEqual(("update", parent.system_id), dv.value)
830 finally:
831 yield listener.stopService()
832
833@@ -1678,7 +1620,6 @@ class TestNDScriptResultListener(
834 @inlineCallbacks
835 def test_calls_handler_with_update_on_create(self):
836 yield deferToDatabase(load_builtin_scripts)
837- yield deferToDatabase(register_websocket_triggers)
838 node = yield deferToDatabase(self.create_node, self.params)
839 script_set = yield deferToDatabase(self.create_scriptset, node)
840
841@@ -1689,7 +1630,7 @@ class TestNDScriptResultListener(
842 try:
843 yield deferToDatabase(self.create_scriptresult, script_set)
844 yield dv.get(timeout=2)
845- self.assertEqual(("update", "%s" % node.system_id), dv.value)
846+ self.assertEqual(("update", node.system_id), dv.value)
847 finally:
848 yield listener.stopService()
849
850@@ -1697,7 +1638,6 @@ class TestNDScriptResultListener(
851 @inlineCallbacks
852 def test_calls_handler_with_update_on_update(self):
853 yield deferToDatabase(load_builtin_scripts)
854- yield deferToDatabase(register_websocket_triggers)
855 node = yield deferToDatabase(self.create_node, self.params)
856 script_set = yield deferToDatabase(self.create_scriptset, node)
857 script_result = yield deferToDatabase(
858@@ -1713,7 +1653,7 @@ class TestNDScriptResultListener(
859 try:
860 yield deferToDatabase(script_result.store_result, 0)
861 yield dv.get(timeout=2)
862- self.assertEqual(("update", "%s" % node.system_id), dv.value)
863+ self.assertEqual(("update", node.system_id), dv.value)
864 finally:
865 yield listener.stopService()
866
867@@ -1721,7 +1661,6 @@ class TestNDScriptResultListener(
868 @inlineCallbacks
869 def test_calls_handler_with_update_on_delete(self):
870 yield deferToDatabase(load_builtin_scripts)
871- yield deferToDatabase(register_websocket_triggers)
872 node = yield deferToDatabase(self.create_node, self.params)
873 script_set = yield deferToDatabase(self.create_scriptset, node)
874 script_result = yield deferToDatabase(
875@@ -1735,7 +1674,7 @@ class TestNDScriptResultListener(
876 try:
877 yield deferToDatabase(self.delete_scriptresult, script_result)
878 yield dv.get(timeout=2)
879- self.assertEqual(("update", "%s" % node.system_id), dv.value)
880+ self.assertEqual(("update", node.system_id), dv.value)
881 finally:
882 yield listener.stopService()
883
884@@ -1751,7 +1690,6 @@ class TestScriptResultListener(
885 @inlineCallbacks
886 def test_calls_handler_with_update_on_create(self):
887 yield deferToDatabase(load_builtin_scripts)
888- yield deferToDatabase(register_websocket_triggers)
889 node = yield deferToDatabase(self.create_node)
890 script_set = yield deferToDatabase(self.create_scriptset, node)
891
892@@ -1764,7 +1702,7 @@ class TestScriptResultListener(
893 self.create_scriptresult, script_set
894 )
895 yield dv.get(timeout=2)
896- self.assertEqual(("create", "%s" % script_result.id), dv.value)
897+ self.assertEqual(("create", str(script_result.id)), dv.value)
898 finally:
899 yield listener.stopService()
900
901@@ -1772,7 +1710,6 @@ class TestScriptResultListener(
902 @inlineCallbacks
903 def test_calls_handler_with_update_on_update(self):
904 yield deferToDatabase(load_builtin_scripts)
905- yield deferToDatabase(register_websocket_triggers)
906 node = yield deferToDatabase(self.create_node)
907 script_set = yield deferToDatabase(self.create_scriptset, node)
908 script_result = yield deferToDatabase(
909@@ -1788,7 +1725,7 @@ class TestScriptResultListener(
910 try:
911 yield deferToDatabase(script_result.store_result, 0)
912 yield dv.get(timeout=2)
913- self.assertEqual(("update", "%s" % script_result.id), dv.value)
914+ self.assertEqual(("update", str(script_result.id)), dv.value)
915 finally:
916 yield listener.stopService()
917
918@@ -1796,7 +1733,6 @@ class TestScriptResultListener(
919 @inlineCallbacks
920 def test_calls_handler_with_update_on_delete(self):
921 yield deferToDatabase(load_builtin_scripts)
922- yield deferToDatabase(register_websocket_triggers)
923 node = yield deferToDatabase(self.create_node)
924 script_set = yield deferToDatabase(self.create_scriptset, node)
925 script_result = yield deferToDatabase(
926@@ -1811,7 +1747,7 @@ class TestScriptResultListener(
927 try:
928 yield deferToDatabase(self.delete_scriptresult, script_result)
929 yield dv.get(timeout=2)
930- self.assertEqual(("delete", "%s" % script_result_id), dv.value)
931+ self.assertEqual(("delete", str(script_result_id)), dv.value)
932 finally:
933 yield listener.stopService()
934
935@@ -1825,7 +1761,6 @@ class TestConfigListener(
936 @wait_for_reactor
937 @inlineCallbacks
938 def test_calls_handler_on_create_notification(self):
939- yield deferToDatabase(register_websocket_triggers)
940 listener = self.make_listener_without_delay()
941 dv = DeferredValue()
942 listener.register("config", lambda *args: dv.set(args))
943@@ -1840,7 +1775,7 @@ class TestConfigListener(
944 transactional(Config.objects.get), name="config_verbose"
945 )
946 yield dv.get(timeout=2)
947- self.assertEqual(("create", "%s" % obj.id), dv.value)
948+ self.assertEqual(("create", str(obj.id)), dv.value)
949 finally:
950 yield listener.stopService()
951
952@@ -1850,7 +1785,6 @@ class TestConfigListener(
953 yield deferToDatabase(
954 transactional(Config.objects.set_config), "config_verbose", True
955 )
956- yield deferToDatabase(register_websocket_triggers)
957 listener = self.make_listener_without_delay()
958 dv = DeferredValue()
959 listener.register("config", lambda *args: dv.set(args))
960@@ -1865,7 +1799,7 @@ class TestConfigListener(
961 transactional(Config.objects.get), name="config_verbose"
962 )
963 yield dv.get(timeout=2)
964- self.assertEqual(("update", "%s" % obj.id), dv.value)
965+ self.assertEqual(("update", str(obj.id)), dv.value)
966 finally:
967 yield listener.stopService()
968
969@@ -1875,7 +1809,6 @@ class TestConfigListener(
970 yield deferToDatabase(
971 transactional(Config.objects.set_config), "config_verbose", True
972 )
973- yield deferToDatabase(register_websocket_triggers)
974 listener = self.make_listener_without_delay()
975 dv = DeferredValue()
976 listener.register("config", lambda *args: dv.set(args))
977@@ -1887,7 +1820,7 @@ class TestConfigListener(
978 old_id = obj.id
979 yield deferToDatabase(transactional(obj.delete))
980 yield dv.get(timeout=2)
981- self.assertEqual(("delete", "%s" % old_id), dv.value)
982+ self.assertEqual(("delete", str(old_id)), dv.value)
983 finally:
984 yield listener.stopService()
985
986@@ -1936,7 +1869,6 @@ class TestNodeInterfaceListener(
987 @wait_for_reactor
988 @inlineCallbacks
989 def test_calls_handler_with_update_on_create(self):
990- yield deferToDatabase(register_websocket_triggers)
991 node = yield deferToDatabase(self.create_node, self.params)
992
993 listener = self.make_listener_without_delay()
994@@ -1946,14 +1878,13 @@ class TestNodeInterfaceListener(
995 try:
996 yield deferToDatabase(self.create_interface, {"node": node})
997 yield dv.get(timeout=2)
998- self.assertEqual(("update", "%s" % node.system_id), dv.value)
999+ self.assertEqual(("update", node.system_id), dv.value)
1000 finally:
1001 yield listener.stopService()
1002
1003 @wait_for_reactor
1004 @inlineCallbacks
1005 def test_calls_handler_with_update_on_delete(self):
1006- yield deferToDatabase(register_websocket_triggers)
1007 node = yield deferToDatabase(self.create_node, self.params)
1008 interface = yield deferToDatabase(
1009 self.create_interface, {"node": node}
1010@@ -1966,7 +1897,7 @@ class TestNodeInterfaceListener(
1011 try:
1012 yield deferToDatabase(self.delete_interface, interface.id)
1013 yield dv.get(timeout=2)
1014- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1015+ self.assertEqual(("update", node.system_id), dv.value)
1016 finally:
1017 yield listener.stopService()
1018
1019@@ -1974,7 +1905,6 @@ class TestNodeInterfaceListener(
1020 @wait_for_reactor
1021 @inlineCallbacks
1022 def test_calls_handler_with_update_on_update(self):
1023- yield deferToDatabase(register_websocket_triggers)
1024 node = yield deferToDatabase(self.create_node, self.params)
1025 interface = yield deferToDatabase(
1026 self.create_interface, {"node": node}
1027@@ -1991,14 +1921,13 @@ class TestNodeInterfaceListener(
1028 {"mac_address": factory.make_MAC()},
1029 )
1030 yield dv.get(timeout=2)
1031- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1032+ self.assertEqual(("update", node.system_id), dv.value)
1033 finally:
1034 yield listener.stopService()
1035
1036 @wait_for_reactor
1037 @inlineCallbacks
1038 def test_calls_handler_with_update_on_old_node_on_update(self):
1039- yield deferToDatabase(register_websocket_triggers)
1040 node1 = yield deferToDatabase(self.create_node, self.params)
1041 node2 = yield deferToDatabase(self.create_node, self.params)
1042 interface = yield deferToDatabase(
1043@@ -2023,8 +1952,8 @@ class TestNodeInterfaceListener(
1044 yield dvs[1].get(timeout=2)
1045 self.assertCountEqual(
1046 [
1047- ("update", "%s" % node1.system_id),
1048- ("update", "%s" % node2.system_id),
1049+ ("update", node1.system_id),
1050+ ("update", node2.system_id),
1051 ],
1052 [dvs[0].value, dvs[1].value],
1053 )
1054@@ -2041,7 +1970,6 @@ class TestDeviceWithParentInterfaceListener(
1055 @wait_for_reactor
1056 @inlineCallbacks
1057 def test_calls_handler_with_update_on_create(self):
1058- yield deferToDatabase(register_websocket_triggers)
1059 device, parent = yield deferToDatabase(self.create_device_with_parent)
1060
1061 listener = self.make_listener_without_delay()
1062@@ -2051,14 +1979,13 @@ class TestDeviceWithParentInterfaceListener(
1063 try:
1064 yield deferToDatabase(self.create_interface, {"node": device})
1065 yield dv.get(timeout=2)
1066- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
1067+ self.assertEqual(("update", parent.system_id), dv.value)
1068 finally:
1069 yield listener.stopService()
1070
1071 @wait_for_reactor
1072 @inlineCallbacks
1073 def test_calls_handler_with_update_on_delete(self):
1074- yield deferToDatabase(register_websocket_triggers)
1075 device, parent = yield deferToDatabase(self.create_device_with_parent)
1076 interface = yield deferToDatabase(
1077 self.create_interface, {"node": device}
1078@@ -2071,14 +1998,13 @@ class TestDeviceWithParentInterfaceListener(
1079 try:
1080 yield deferToDatabase(self.delete_interface, interface.id)
1081 yield dv.get(timeout=2)
1082- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
1083+ self.assertEqual(("update", parent.system_id), dv.value)
1084 finally:
1085 yield listener.stopService()
1086
1087 @wait_for_reactor
1088 @inlineCallbacks
1089 def test_calls_handler_with_update_on_update(self):
1090- yield deferToDatabase(register_websocket_triggers)
1091 device, parent = yield deferToDatabase(self.create_device_with_parent)
1092 interface = yield deferToDatabase(
1093 self.create_interface, {"node": device}
1094@@ -2095,14 +2021,13 @@ class TestDeviceWithParentInterfaceListener(
1095 {"mac_address": factory.make_MAC()},
1096 )
1097 yield dv.get(timeout=2)
1098- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
1099+ self.assertEqual(("update", parent.system_id), dv.value)
1100 finally:
1101 yield listener.stopService()
1102
1103 @wait_for_reactor
1104 @inlineCallbacks
1105 def test_calls_handler_with_update_on_old_node_on_update(self):
1106- yield deferToDatabase(register_websocket_triggers)
1107 device1, parent1 = yield deferToDatabase(
1108 self.create_device_with_parent
1109 )
1110@@ -2131,8 +2056,8 @@ class TestDeviceWithParentInterfaceListener(
1111 yield dvs[1].get(timeout=2)
1112 self.assertCountEqual(
1113 [
1114- ("update", "%s" % parent1.system_id),
1115- ("update", "%s" % parent2.system_id),
1116+ ("update", parent1.system_id),
1117+ ("update", parent2.system_id),
1118 ],
1119 [dvs[0].value, dvs[1].value],
1120 )
1121@@ -2149,7 +2074,6 @@ class TestFabricListener(
1122 @wait_for_reactor
1123 @inlineCallbacks
1124 def test_calls_handler_on_create_notification_with_blank_name(self):
1125- yield deferToDatabase(register_websocket_triggers)
1126 listener = self.make_listener_without_delay()
1127 dvs = [DeferredValue(), DeferredValue()]
1128 save_dvs = dvs[:]
1129@@ -2161,7 +2085,7 @@ class TestFabricListener(
1130 (dv.get(timeout=2) for dv in save_dvs)
1131 )
1132 self.assertCountEqual(
1133- [("create", "%s" % fabric.id), ("update", "%s" % fabric.id)],
1134+ [("create", str(fabric.id)), ("update", str(fabric.id))],
1135 [res for (suc, res) in results],
1136 )
1137 finally:
1138@@ -2170,7 +2094,6 @@ class TestFabricListener(
1139 @wait_for_reactor
1140 @inlineCallbacks
1141 def test_calls_handler_on_create_notification_with_name(self):
1142- yield deferToDatabase(register_websocket_triggers)
1143 listener = self.make_listener_without_delay()
1144 dv = DeferredValue()
1145 listener.register("fabric", lambda *args: dv.set(args))
1146@@ -2180,14 +2103,13 @@ class TestFabricListener(
1147 self.create_fabric, {"name": factory.make_name("name")}
1148 )
1149 yield dv.get(timeout=2)
1150- self.assertEqual(("create", "%s" % fabric.id), dv.value)
1151+ self.assertEqual(("create", str(fabric.id)), dv.value)
1152 finally:
1153 yield listener.stopService()
1154
1155 @wait_for_reactor
1156 @inlineCallbacks
1157 def test_calls_handler_on_update_notification(self):
1158- yield deferToDatabase(register_websocket_triggers)
1159 listener = self.make_listener_without_delay()
1160 dv = DeferredValue()
1161 listener.register("fabric", lambda *args: dv.set(args))
1162@@ -2201,14 +2123,13 @@ class TestFabricListener(
1163 {"name": factory.make_name("name")},
1164 )
1165 yield dv.get(timeout=2)
1166- self.assertEqual(("update", "%s" % fabric.id), dv.value)
1167+ self.assertEqual(("update", str(fabric.id)), dv.value)
1168 finally:
1169 yield listener.stopService()
1170
1171 @wait_for_reactor
1172 @inlineCallbacks
1173 def test_calls_handler_on_delete_notification(self):
1174- yield deferToDatabase(register_websocket_triggers)
1175 listener = self.make_listener_without_delay()
1176 dv = DeferredValue()
1177 listener.register("fabric", lambda *args: dv.set(args))
1178@@ -2217,7 +2138,7 @@ class TestFabricListener(
1179 try:
1180 yield deferToDatabase(self.delete_fabric, fabric.id)
1181 yield dv.get(timeout=2)
1182- self.assertEqual(("delete", "%s" % fabric.id), dv.value)
1183+ self.assertEqual(("delete", str(fabric.id)), dv.value)
1184 finally:
1185 yield listener.stopService()
1186
1187@@ -2232,7 +2153,6 @@ class TestVLANListener(
1188 @inlineCallbacks
1189 def test_calls_handler_on_create_notification(self):
1190 fabric = yield deferToDatabase(self.create_fabric)
1191- yield deferToDatabase(register_websocket_triggers)
1192 listener = self.make_listener_without_delay()
1193 dv = DeferredValue()
1194 listener.register("vlan", lambda *args: dv.set(args))
1195@@ -2240,7 +2160,7 @@ class TestVLANListener(
1196 try:
1197 vlan = yield deferToDatabase(self.create_vlan, {"fabric": fabric})
1198 yield dv.get(timeout=2)
1199- self.assertEqual(("create", "%s" % vlan.id), dv.value)
1200+ self.assertEqual(("create", str(vlan.id)), dv.value)
1201 finally:
1202 yield listener.stopService()
1203
1204@@ -2248,7 +2168,6 @@ class TestVLANListener(
1205 @inlineCallbacks
1206 def test_calls_handler_on_update_notification(self):
1207 fabric = yield deferToDatabase(self.create_fabric)
1208- yield deferToDatabase(register_websocket_triggers)
1209 listener = self.make_listener_without_delay()
1210 dv = DeferredValue()
1211 listener.register("vlan", lambda *args: dv.set(args))
1212@@ -2260,7 +2179,7 @@ class TestVLANListener(
1213 self.update_vlan, vlan.id, {"name": factory.make_name("name")}
1214 )
1215 yield dv.get(timeout=2)
1216- self.assertEqual(("update", "%s" % vlan.id), dv.value)
1217+ self.assertEqual(("update", str(vlan.id)), dv.value)
1218 finally:
1219 yield listener.stopService()
1220
1221@@ -2268,7 +2187,6 @@ class TestVLANListener(
1222 @inlineCallbacks
1223 def test_calls_handler_on_delete_notification(self):
1224 fabric = yield deferToDatabase(self.create_fabric)
1225- yield deferToDatabase(register_websocket_triggers)
1226 listener = self.make_listener_without_delay()
1227 dv = DeferredValue()
1228 listener.register("vlan", lambda *args: dv.set(args))
1229@@ -2277,7 +2195,7 @@ class TestVLANListener(
1230 try:
1231 yield deferToDatabase(self.delete_vlan, vlan.id)
1232 yield dv.get(timeout=2)
1233- self.assertEqual(("delete", "%s" % vlan.id), dv.value)
1234+ self.assertEqual(("delete", str(vlan.id)), dv.value)
1235 finally:
1236 yield listener.stopService()
1237
1238@@ -2291,7 +2209,6 @@ class TestIPRangeListener(
1239 @wait_for_reactor
1240 @inlineCallbacks
1241 def test_calls_handler_on_create_notification(self):
1242- yield deferToDatabase(register_websocket_triggers)
1243 listener = self.make_listener_without_delay()
1244 dv = DeferredValue()
1245 listener.register("iprange", lambda *args: dv.set(args))
1246@@ -2308,14 +2225,13 @@ class TestIPRangeListener(
1247 try:
1248 iprange = yield deferToDatabase(self.create_iprange, params)
1249 yield dv.get(timeout=2)
1250- self.assertEqual(("create", "%s" % iprange.id), dv.value)
1251+ self.assertEqual(("create", str(iprange.id)), dv.value)
1252 finally:
1253 yield listener.stopService()
1254
1255 @wait_for_reactor
1256 @inlineCallbacks
1257 def test_calls_handler_on_update_notification(self):
1258- yield deferToDatabase(register_websocket_triggers)
1259 listener = self.make_listener_without_delay()
1260 dv = DeferredValue()
1261 listener.register("iprange", lambda *args: dv.set(args))
1262@@ -2328,14 +2244,13 @@ class TestIPRangeListener(
1263 {"comment": factory.make_name("name")},
1264 )
1265 yield dv.get(timeout=2)
1266- self.assertEqual(("update", "%s" % iprange.id), dv.value)
1267+ self.assertEqual(("update", str(iprange.id)), dv.value)
1268 finally:
1269 yield listener.stopService()
1270
1271 @wait_for_reactor
1272 @inlineCallbacks
1273 def test_calls_handler_on_delete_notification(self):
1274- yield deferToDatabase(register_websocket_triggers)
1275 listener = self.make_listener_without_delay()
1276 dv = DeferredValue()
1277 listener.register("iprange", lambda *args: dv.set(args))
1278@@ -2344,7 +2259,7 @@ class TestIPRangeListener(
1279 try:
1280 yield deferToDatabase(self.delete_iprange, iprange.id)
1281 yield dv.get(timeout=2)
1282- self.assertEqual(("delete", "%s" % iprange.id), dv.value)
1283+ self.assertEqual(("delete", str(iprange.id)), dv.value)
1284 finally:
1285 yield listener.stopService()
1286
1287@@ -2358,7 +2273,6 @@ class TestStaticRouteListener(
1288 @wait_for_reactor
1289 @inlineCallbacks
1290 def test_calls_handler_on_create_notification(self):
1291- yield deferToDatabase(register_websocket_triggers)
1292 listener = self.make_listener_without_delay()
1293 dv = DeferredValue()
1294 listener.register("staticroute", lambda *args: dv.set(args))
1295@@ -2366,14 +2280,13 @@ class TestStaticRouteListener(
1296 try:
1297 staticroute = yield deferToDatabase(self.create_staticroute)
1298 yield dv.get(timeout=2)
1299- self.assertEqual(("create", "%s" % staticroute.id), dv.value)
1300+ self.assertEqual(("create", str(staticroute.id)), dv.value)
1301 finally:
1302 yield listener.stopService()
1303
1304 @wait_for_reactor
1305 @inlineCallbacks
1306 def test_calls_handler_on_update_notification(self):
1307- yield deferToDatabase(register_websocket_triggers)
1308 listener = self.make_listener_without_delay()
1309 dv = DeferredValue()
1310 listener.register("staticroute", lambda *args: dv.set(args))
1311@@ -2388,14 +2301,13 @@ class TestStaticRouteListener(
1312 {"metric": random.randint(10, 500)},
1313 )
1314 yield dv.get(timeout=2)
1315- self.assertEqual(("update", "%s" % staticroute.id), dv.value)
1316+ self.assertEqual(("update", str(staticroute.id)), dv.value)
1317 finally:
1318 yield listener.stopService()
1319
1320 @wait_for_reactor
1321 @inlineCallbacks
1322 def test_calls_handler_on_delete_notification(self):
1323- yield deferToDatabase(register_websocket_triggers)
1324 listener = self.make_listener_without_delay()
1325 dv = DeferredValue()
1326 listener.register("staticroute", lambda *args: dv.set(args))
1327@@ -2404,7 +2316,7 @@ class TestStaticRouteListener(
1328 try:
1329 yield deferToDatabase(self.delete_staticroute, staticroute.id)
1330 yield dv.get(timeout=2)
1331- self.assertEqual(("delete", "%s" % staticroute.id), dv.value)
1332+ self.assertEqual(("delete", str(staticroute.id)), dv.value)
1333 finally:
1334 yield listener.stopService()
1335
1336@@ -2418,7 +2330,6 @@ class TestDomainListener(
1337 @wait_for_reactor
1338 @inlineCallbacks
1339 def test_calls_handler_on_create_notification(self):
1340- yield deferToDatabase(register_websocket_triggers)
1341 listener = self.make_listener_without_delay()
1342 dv = DeferredValue()
1343 listener.register("domain", lambda *args: dv.set(args))
1344@@ -2426,14 +2337,13 @@ class TestDomainListener(
1345 try:
1346 domain = yield deferToDatabase(self.create_domain)
1347 yield dv.get(timeout=2)
1348- self.assertEqual(("create", "%s" % domain.id), dv.value)
1349+ self.assertEqual(("create", str(domain.id)), dv.value)
1350 finally:
1351 yield listener.stopService()
1352
1353 @wait_for_reactor
1354 @inlineCallbacks
1355 def test_calls_handler_on_update_notification(self):
1356- yield deferToDatabase(register_websocket_triggers)
1357 listener = self.make_listener_without_delay()
1358 dv = DeferredValue()
1359 listener.register("domain", lambda *args: dv.set(args))
1360@@ -2447,14 +2357,13 @@ class TestDomainListener(
1361 {"name": factory.make_name("name")},
1362 )
1363 yield dv.get(timeout=2)
1364- self.assertEqual(("update", "%s" % domain.id), dv.value)
1365+ self.assertEqual(("update", str(domain.id)), dv.value)
1366 finally:
1367 yield listener.stopService()
1368
1369 @wait_for_reactor
1370 @inlineCallbacks
1371 def test_calls_handler_on_delete_notification(self):
1372- yield deferToDatabase(register_websocket_triggers)
1373 listener = self.make_listener_without_delay()
1374 dv = DeferredValue()
1375 listener.register("domain", lambda *args: dv.set(args))
1376@@ -2463,7 +2372,7 @@ class TestDomainListener(
1377 try:
1378 yield deferToDatabase(self.delete_domain, domain.id)
1379 yield dv.get(timeout=2)
1380- self.assertEqual(("delete", "%s" % domain.id), dv.value)
1381+ self.assertEqual(("delete", str(domain.id)), dv.value)
1382 finally:
1383 yield listener.stopService()
1384
1385@@ -2471,7 +2380,6 @@ class TestDomainListener(
1386 @inlineCallbacks
1387 def test_calls_handler_with_update_on_ip_address_update(self):
1388 domain = yield deferToDatabase(self.create_domain)
1389- yield deferToDatabase(register_websocket_triggers)
1390 params = {"node_type": NODE_TYPE.MACHINE, "domain": domain}
1391 node = yield deferToDatabase(self.create_node, params)
1392 interface = yield deferToDatabase(
1393@@ -2500,7 +2408,7 @@ class TestDomainListener(
1394 {"alloc_type": IPADDRESS_TYPE.STICKY, "ip": selected_ip},
1395 )
1396 yield dv.get(timeout=2)
1397- self.assertEqual(("update", "%s" % domain.id), dv.value)
1398+ self.assertEqual(("update", str(domain.id)), dv.value)
1399 finally:
1400 yield listener.stopService()
1401
1402@@ -2508,7 +2416,6 @@ class TestDomainListener(
1403 @inlineCallbacks
1404 def test_calls_handler_with_update_on_node_ip_address_addition(self):
1405 domain = yield deferToDatabase(self.create_domain)
1406- yield deferToDatabase(register_websocket_triggers)
1407 params = {"node_type": NODE_TYPE.MACHINE, "domain": domain}
1408 node = yield deferToDatabase(self.create_node, params)
1409 interface = yield deferToDatabase(
1410@@ -2532,7 +2439,7 @@ class TestDomainListener(
1411 },
1412 )
1413 yield dv.get(timeout=2)
1414- self.assertEqual(("update", "%s" % domain.id), dv.value)
1415+ self.assertEqual(("update", str(domain.id)), dv.value)
1416 finally:
1417 yield listener.stopService()
1418
1419@@ -2540,7 +2447,6 @@ class TestDomainListener(
1420 @inlineCallbacks
1421 def test_calls_handler_with_update_on_node_ip_address_removal(self):
1422 domain = yield deferToDatabase(self.create_domain)
1423- yield deferToDatabase(register_websocket_triggers)
1424 params = {"node_type": NODE_TYPE.MACHINE, "domain": domain}
1425 node = yield deferToDatabase(self.create_node, params)
1426 interface = yield deferToDatabase(
1427@@ -2565,7 +2471,7 @@ class TestDomainListener(
1428 try:
1429 yield deferToDatabase(self.delete_staticipaddress, ipaddress.id)
1430 yield dv.get(timeout=2)
1431- self.assertEqual(("update", "%s" % domain.id), dv.value)
1432+ self.assertEqual(("update", str(domain.id)), dv.value)
1433 finally:
1434 yield listener.stopService()
1435
1436@@ -2573,7 +2479,6 @@ class TestDomainListener(
1437 @inlineCallbacks
1438 def test_calls_handler_on_dnsresource_create_notification(self):
1439 domain = yield deferToDatabase(self.create_domain)
1440- yield deferToDatabase(register_websocket_triggers)
1441 listener = self.make_listener_without_delay()
1442 dv = DeferredValue()
1443 listener.register("domain", lambda *args: dv.set(args))
1444@@ -2581,7 +2486,7 @@ class TestDomainListener(
1445 try:
1446 yield deferToDatabase(self.create_dnsresource, {"domain": domain})
1447 yield dv.get(timeout=2)
1448- self.assertEqual(("update", "%s" % domain.id), dv.value)
1449+ self.assertEqual(("update", str(domain.id)), dv.value)
1450 finally:
1451 yield listener.stopService()
1452
1453@@ -2589,7 +2494,6 @@ class TestDomainListener(
1454 @inlineCallbacks
1455 def test_calls_handler_on_dnsresource_address_addition(self):
1456 domain = yield deferToDatabase(self.create_domain)
1457- yield deferToDatabase(register_websocket_triggers)
1458 listener = self.make_listener_without_delay()
1459 dv = DeferredValue()
1460 dnsrr = yield deferToDatabase(
1461@@ -2612,7 +2516,7 @@ class TestDomainListener(
1462 },
1463 )
1464 yield dv.get(timeout=2)
1465- self.assertEqual(("update", "%s" % domain.id), dv.value)
1466+ self.assertEqual(("update", str(domain.id)), dv.value)
1467 finally:
1468 yield listener.stopService()
1469
1470@@ -2620,7 +2524,6 @@ class TestDomainListener(
1471 @inlineCallbacks
1472 def test_calls_handler_on_dnsresource_address_removal(self):
1473 domain = yield deferToDatabase(self.create_domain)
1474- yield deferToDatabase(register_websocket_triggers)
1475 dnsrr = yield deferToDatabase(
1476 self.create_dnsresource, {"domain": domain}
1477 )
1478@@ -2632,7 +2535,7 @@ class TestDomainListener(
1479 try:
1480 yield deferToDatabase(self.delete_staticipaddress, staticip.id)
1481 yield dv.get(timeout=2)
1482- self.assertEqual(("update", "%s" % domain.id), dv.value)
1483+ self.assertEqual(("update", str(domain.id)), dv.value)
1484 finally:
1485 yield listener.stopService()
1486
1487@@ -2640,7 +2543,6 @@ class TestDomainListener(
1488 @inlineCallbacks
1489 def test_calls_handler_on_dnsresource_update_notification(self):
1490 domain = yield deferToDatabase(self.create_domain)
1491- yield deferToDatabase(register_websocket_triggers)
1492 listener = self.make_listener_without_delay()
1493 dv = DeferredValue()
1494 dnsrr = yield deferToDatabase(
1495@@ -2656,7 +2558,7 @@ class TestDomainListener(
1496 {"name": factory.make_name("name")},
1497 )
1498 yield dv.get(timeout=2)
1499- self.assertEqual(("update", "%s" % domain.id), dv.value)
1500+ self.assertEqual(("update", str(domain.id)), dv.value)
1501 finally:
1502 yield listener.stopService()
1503
1504@@ -2664,7 +2566,6 @@ class TestDomainListener(
1505 @inlineCallbacks
1506 def test_calls_handler_on_dnsresource_delete_notification(self):
1507 domain = yield deferToDatabase(self.create_domain)
1508- yield deferToDatabase(register_websocket_triggers)
1509 dnsrr = yield deferToDatabase(
1510 self.create_dnsresource, {"domain": domain}
1511 )
1512@@ -2675,7 +2576,7 @@ class TestDomainListener(
1513 try:
1514 yield deferToDatabase(self.delete_dnsresource, dnsrr.id)
1515 yield dv.get(timeout=2)
1516- self.assertEqual(("update", "%s" % domain.id), dv.value)
1517+ self.assertEqual(("update", str(domain.id)), dv.value)
1518 finally:
1519 yield listener.stopService()
1520
1521@@ -2683,7 +2584,6 @@ class TestDomainListener(
1522 @inlineCallbacks
1523 def test_calls_handler_on_dnsdata_create_notification(self):
1524 domain = yield deferToDatabase(self.create_domain)
1525- yield deferToDatabase(register_websocket_triggers)
1526 listener = self.make_listener_without_delay()
1527 dv = DeferredValue()
1528 listener.register("domain", lambda *args: dv.set(args))
1529@@ -2691,7 +2591,7 @@ class TestDomainListener(
1530 try:
1531 yield deferToDatabase(self.create_dnsdata, {"domain": domain})
1532 yield dv.get(timeout=2)
1533- self.assertEqual(("update", "%s" % domain.id), dv.value)
1534+ self.assertEqual(("update", str(domain.id)), dv.value)
1535 finally:
1536 yield listener.stopService()
1537
1538@@ -2699,7 +2599,6 @@ class TestDomainListener(
1539 @inlineCallbacks
1540 def test_calls_handler_on_dnsdata_update_notification(self):
1541 domain = yield deferToDatabase(self.create_domain)
1542- yield deferToDatabase(register_websocket_triggers)
1543 listener = self.make_listener_without_delay()
1544 dv = DeferredValue()
1545 dnsdata = yield deferToDatabase(
1546@@ -2715,7 +2614,7 @@ class TestDomainListener(
1547 {"ttl": random.randint(100, 199)},
1548 )
1549 yield dv.get(timeout=2)
1550- self.assertEqual(("update", "%s" % domain.id), dv.value)
1551+ self.assertEqual(("update", str(domain.id)), dv.value)
1552 finally:
1553 yield listener.stopService()
1554
1555@@ -2723,7 +2622,6 @@ class TestDomainListener(
1556 @inlineCallbacks
1557 def test_calls_handler_on_dnsdata_delete_notification(self):
1558 domain = yield deferToDatabase(self.create_domain)
1559- yield deferToDatabase(register_websocket_triggers)
1560 listener = self.make_listener_without_delay()
1561 dv = DeferredValue()
1562 listener.register("domain", lambda *args: dv.set(args))
1563@@ -2734,7 +2632,7 @@ class TestDomainListener(
1564 try:
1565 yield deferToDatabase(self.delete_dnsdata, dnsdata.id)
1566 yield dv.get(timeout=2)
1567- self.assertEqual(("update", "%s" % domain.id), dv.value)
1568+ self.assertEqual(("update", str(domain.id)), dv.value)
1569 finally:
1570 yield listener.stopService()
1571
1572@@ -2748,7 +2646,6 @@ class TestSubnetListener(
1573 @wait_for_reactor
1574 @inlineCallbacks
1575 def test_calls_handler_on_create_notification(self):
1576- yield deferToDatabase(register_websocket_triggers)
1577 listener = self.make_listener_without_delay()
1578 dv = DeferredValue()
1579 listener.register("subnet", lambda *args: dv.set(args))
1580@@ -2756,14 +2653,13 @@ class TestSubnetListener(
1581 try:
1582 subnet = yield deferToDatabase(self.create_subnet)
1583 yield dv.get(timeout=2)
1584- self.assertEqual(("create", "%s" % subnet.id), dv.value)
1585+ self.assertEqual(("create", str(subnet.id)), dv.value)
1586 finally:
1587 yield listener.stopService()
1588
1589 @wait_for_reactor
1590 @inlineCallbacks
1591 def test_calls_handler_on_update_notification(self):
1592- yield deferToDatabase(register_websocket_triggers)
1593 listener = self.make_listener_without_delay()
1594 dv = DeferredValue()
1595 listener.register("subnet", lambda *args: dv.set(args))
1596@@ -2777,14 +2673,13 @@ class TestSubnetListener(
1597 {"name": factory.make_name("name")},
1598 )
1599 yield dv.get(timeout=2)
1600- self.assertEqual(("update", "%s" % subnet.id), dv.value)
1601+ self.assertEqual(("update", str(subnet.id)), dv.value)
1602 finally:
1603 yield listener.stopService()
1604
1605 @wait_for_reactor
1606 @inlineCallbacks
1607 def test_calls_handler_on_update_notification_for_vlan(self):
1608- yield deferToDatabase(register_websocket_triggers)
1609 listener = self.make_listener_without_delay()
1610 dv = DeferredValue()
1611 listener.register("subnet", lambda *args: dv.set(args))
1612@@ -2798,14 +2693,13 @@ class TestSubnetListener(
1613 {"name": factory.make_name("name")},
1614 )
1615 yield dv.get(timeout=2)
1616- self.assertEqual(("update", "%s" % subnet.id), dv.value)
1617+ self.assertEqual(("update", str(subnet.id)), dv.value)
1618 finally:
1619 yield listener.stopService()
1620
1621 @wait_for_reactor
1622 @inlineCallbacks
1623 def test_calls_handler_on_delete_notification(self):
1624- yield deferToDatabase(register_websocket_triggers)
1625 listener = self.make_listener_without_delay()
1626 dv = DeferredValue()
1627 listener.register("subnet", lambda *args: dv.set(args))
1628@@ -2814,14 +2708,13 @@ class TestSubnetListener(
1629 try:
1630 yield deferToDatabase(self.delete_subnet, subnet.id)
1631 yield dv.get(timeout=2)
1632- self.assertEqual(("delete", "%s" % subnet.id), dv.value)
1633+ self.assertEqual(("delete", str(subnet.id)), dv.value)
1634 finally:
1635 yield listener.stopService()
1636
1637 @wait_for_reactor
1638 @inlineCallbacks
1639 def test_calls_handler_with_update_on_ip_address_insert(self):
1640- yield deferToDatabase(register_websocket_triggers)
1641 node = yield deferToDatabase(
1642 self.create_node,
1643 {"node_type": NODE_TYPE.MACHINE, "interface": True},
1644@@ -2846,14 +2739,13 @@ class TestSubnetListener(
1645 },
1646 )
1647 yield dv.get(timeout=2)
1648- self.assertEqual(("update", "%s" % subnet.id), dv.value)
1649+ self.assertEqual(("update", str(subnet.id)), dv.value)
1650 finally:
1651 yield listener.stopService()
1652
1653 @wait_for_reactor
1654 @inlineCallbacks
1655 def test_calls_handler_with_update_on_ip_address_update(self):
1656- yield deferToDatabase(register_websocket_triggers)
1657 node = yield deferToDatabase(
1658 self.create_node,
1659 {"node_type": NODE_TYPE.MACHINE, "interface": True},
1660@@ -2882,14 +2774,13 @@ class TestSubnetListener(
1661 self.update_staticipaddress, ipaddress.id, {"ip": selected_ip}
1662 )
1663 yield dv.get(timeout=2)
1664- self.assertEqual(("update", "%s" % subnet.id), dv.value)
1665+ self.assertEqual(("update", str(subnet.id)), dv.value)
1666 finally:
1667 yield listener.stopService()
1668
1669 @wait_for_reactor
1670 @inlineCallbacks
1671 def test_calls_handler_with_update_on_ip_address_delete(self):
1672- yield deferToDatabase(register_websocket_triggers)
1673 node = yield deferToDatabase(
1674 self.create_node,
1675 {"node_type": NODE_TYPE.MACHINE, "interface": True},
1676@@ -2915,7 +2806,7 @@ class TestSubnetListener(
1677 try:
1678 yield deferToDatabase(self.delete_staticipaddress, ipaddress.id)
1679 yield dv.get(timeout=2)
1680- self.assertEqual(("update", "%s" % subnet.id), dv.value)
1681+ self.assertEqual(("update", str(subnet.id)), dv.value)
1682 finally:
1683 yield listener.stopService()
1684
1685@@ -2929,7 +2820,6 @@ class TestSpaceListener(
1686 @wait_for_reactor
1687 @inlineCallbacks
1688 def test_calls_handler_on_create_notification_with_blank_name(self):
1689- yield deferToDatabase(register_websocket_triggers)
1690 listener = self.make_listener_without_delay()
1691 dvs = [DeferredValue(), DeferredValue()]
1692 save_dvs = dvs[:]
1693@@ -2941,7 +2831,7 @@ class TestSpaceListener(
1694 (dv.get(timeout=2) for dv in save_dvs)
1695 )
1696 self.assertCountEqual(
1697- [("create", "%s" % space.id), ("update", "%s" % space.id)],
1698+ [("create", str(space.id)), ("update", str(space.id))],
1699 [res for (suc, res) in results],
1700 )
1701 finally:
1702@@ -2950,7 +2840,6 @@ class TestSpaceListener(
1703 @wait_for_reactor
1704 @inlineCallbacks
1705 def test_calls_handler_on_create_notification_with_name(self):
1706- yield deferToDatabase(register_websocket_triggers)
1707 listener = self.make_listener_without_delay()
1708 dv = DeferredValue()
1709 listener.register("space", lambda *args: dv.set(args))
1710@@ -2960,14 +2849,13 @@ class TestSpaceListener(
1711 self.create_space, {"name": factory.make_name("name")}
1712 )
1713 yield dv.get(timeout=2)
1714- self.assertEqual(("create", "%s" % space.id), dv.value)
1715+ self.assertEqual(("create", str(space.id)), dv.value)
1716 finally:
1717 yield listener.stopService()
1718
1719 @wait_for_reactor
1720 @inlineCallbacks
1721 def test_calls_handler_on_update_notification(self):
1722- yield deferToDatabase(register_websocket_triggers)
1723 listener = self.make_listener_without_delay()
1724 dv = DeferredValue()
1725 listener.register("space", lambda *args: dv.set(args))
1726@@ -2981,14 +2869,13 @@ class TestSpaceListener(
1727 {"name": factory.make_name("name")},
1728 )
1729 yield dv.get(timeout=2)
1730- self.assertEqual(("update", "%s" % space.id), dv.value)
1731+ self.assertEqual(("update", str(space.id)), dv.value)
1732 finally:
1733 yield listener.stopService()
1734
1735 @wait_for_reactor
1736 @inlineCallbacks
1737 def test_calls_handler_on_delete_notification(self):
1738- yield deferToDatabase(register_websocket_triggers)
1739 listener = self.make_listener_without_delay()
1740 dv = DeferredValue()
1741 listener.register("space", lambda *args: dv.set(args))
1742@@ -2997,7 +2884,7 @@ class TestSpaceListener(
1743 try:
1744 yield deferToDatabase(self.delete_space, space.id)
1745 yield dv.get(timeout=2)
1746- self.assertEqual(("delete", "%s" % space.id), dv.value)
1747+ self.assertEqual(("delete", str(space.id)), dv.value)
1748 finally:
1749 yield listener.stopService()
1750
1751@@ -3059,7 +2946,6 @@ class TestNodeNetworkListener(
1752 @wait_for_reactor
1753 @inlineCallbacks
1754 def test_calls_handler_iface_with_update_on_fabric_update(self):
1755- yield deferToDatabase(register_websocket_triggers)
1756 node = yield deferToDatabase(self.create_node, self.params)
1757 interface = yield deferToDatabase(
1758 self.get_node_boot_interface, node.system_id
1759@@ -3080,14 +2966,13 @@ class TestNodeNetworkListener(
1760 {"name": factory.make_name("name")},
1761 )
1762 yield dv.get(timeout=2)
1763- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1764+ self.assertEqual(("update", node.system_id), dv.value)
1765 finally:
1766 yield listener.stopService()
1767
1768 @wait_for_reactor
1769 @inlineCallbacks
1770 def test_calls_handler_iface_with_update_on_vlan_update(self):
1771- yield deferToDatabase(register_websocket_triggers)
1772 node = yield deferToDatabase(self.create_node, self.params)
1773 interface = yield deferToDatabase(
1774 self.get_node_boot_interface, node.system_id
1775@@ -3105,14 +2990,13 @@ class TestNodeNetworkListener(
1776 self.update_vlan, vlan.id, {"name": factory.make_name("name")}
1777 )
1778 yield dv.get(timeout=2)
1779- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1780+ self.assertEqual(("update", node.system_id), dv.value)
1781 finally:
1782 yield listener.stopService()
1783
1784 @wait_for_reactor
1785 @inlineCallbacks
1786 def test_calls_handler_with_update_on_subnet_update(self):
1787- yield deferToDatabase(register_websocket_triggers)
1788 node = yield deferToDatabase(self.create_node, self.params)
1789 interface = yield deferToDatabase(
1790 self.get_node_boot_interface, node.system_id
1791@@ -3133,14 +3017,13 @@ class TestNodeNetworkListener(
1792 {"name": factory.make_name("name")},
1793 )
1794 yield dv.get(timeout=2)
1795- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1796+ self.assertEqual(("update", node.system_id), dv.value)
1797 finally:
1798 yield listener.stopService()
1799
1800 @wait_for_reactor
1801 @inlineCallbacks
1802 def test_calls_handler_with_update_on_space_update(self):
1803- yield deferToDatabase(register_websocket_triggers)
1804 node = yield deferToDatabase(self.create_node, self.params)
1805 interface = yield deferToDatabase(
1806 self.get_node_boot_interface, node.system_id
1807@@ -3161,14 +3044,13 @@ class TestNodeNetworkListener(
1808 {"name": factory.make_name("name")},
1809 )
1810 yield dv.get(timeout=2)
1811- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1812+ self.assertEqual(("update", node.system_id), dv.value)
1813 finally:
1814 yield listener.stopService()
1815
1816 @wait_for_reactor
1817 @inlineCallbacks
1818 def test_calls_handler_with_update_on_ip_address_update(self):
1819- yield deferToDatabase(register_websocket_triggers)
1820 node = yield deferToDatabase(self.create_node, self.params)
1821 interface = yield deferToDatabase(
1822 self.get_node_boot_interface, node.system_id
1823@@ -3194,7 +3076,7 @@ class TestNodeNetworkListener(
1824 self.update_staticipaddress, ipaddress.id, {"ip": selected_ip}
1825 )
1826 yield dv.get(timeout=2)
1827- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1828+ self.assertEqual(("update", node.system_id), dv.value)
1829 finally:
1830 yield listener.stopService()
1831
1832@@ -3209,7 +3091,6 @@ class TestDeviceWithParentNetworkListener(
1833 @wait_for_reactor
1834 @inlineCallbacks
1835 def test_calls_handler_iface_with_update_on_fabric_update(self):
1836- yield deferToDatabase(register_websocket_triggers)
1837 device, parent = yield deferToDatabase(
1838 self.create_device_with_parent, {"interface": True}
1839 )
1840@@ -3232,14 +3113,13 @@ class TestDeviceWithParentNetworkListener(
1841 {"name": factory.make_name("name")},
1842 )
1843 yield dv.get(timeout=2)
1844- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
1845+ self.assertEqual(("update", parent.system_id), dv.value)
1846 finally:
1847 yield listener.stopService()
1848
1849 @wait_for_reactor
1850 @inlineCallbacks
1851 def test_calls_handler_iface_with_update_on_vlan_update(self):
1852- yield deferToDatabase(register_websocket_triggers)
1853 device, parent = yield deferToDatabase(
1854 self.create_device_with_parent, {"interface": True}
1855 )
1856@@ -3260,14 +3140,13 @@ class TestDeviceWithParentNetworkListener(
1857 self.update_vlan, vlan.id, {"name": factory.make_name("name")}
1858 )
1859 yield dv.get(timeout=2)
1860- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
1861+ self.assertEqual(("update", parent.system_id), dv.value)
1862 finally:
1863 yield listener.stopService()
1864
1865 @wait_for_reactor
1866 @inlineCallbacks
1867 def test_calls_handler_with_update_on_subnet_update(self):
1868- yield deferToDatabase(register_websocket_triggers)
1869 device, parent = yield deferToDatabase(
1870 self.create_device_with_parent, {"interface": True}
1871 )
1872@@ -3290,14 +3169,13 @@ class TestDeviceWithParentNetworkListener(
1873 {"name": factory.make_name("name")},
1874 )
1875 yield dv.get(timeout=2)
1876- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
1877+ self.assertEqual(("update", parent.system_id), dv.value)
1878 finally:
1879 yield listener.stopService()
1880
1881 @wait_for_reactor
1882 @inlineCallbacks
1883 def test_calls_handler_with_update_on_space_update(self):
1884- yield deferToDatabase(register_websocket_triggers)
1885 device, parent = yield deferToDatabase(
1886 self.create_device_with_parent, {"interface": True}
1887 )
1888@@ -3320,14 +3198,13 @@ class TestDeviceWithParentNetworkListener(
1889 {"name": factory.make_name("name")},
1890 )
1891 yield dv.get(timeout=2)
1892- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
1893+ self.assertEqual(("update", parent.system_id), dv.value)
1894 finally:
1895 yield listener.stopService()
1896
1897 @wait_for_reactor
1898 @inlineCallbacks
1899 def test_calls_handler_with_update_on_ip_address_update(self):
1900- yield deferToDatabase(register_websocket_triggers)
1901 device, parent = yield deferToDatabase(
1902 self.create_device_with_parent, {"interface": True}
1903 )
1904@@ -3355,7 +3232,7 @@ class TestDeviceWithParentNetworkListener(
1905 self.update_staticipaddress, ipaddress.id, {"ip": selected_ip}
1906 )
1907 yield dv.get(timeout=2)
1908- self.assertEqual(("update", "%s" % parent.system_id), dv.value)
1909+ self.assertEqual(("update", parent.system_id), dv.value)
1910 finally:
1911 yield listener.stopService()
1912
1913@@ -3369,7 +3246,6 @@ class TestStaticIPAddressSubnetListener(
1914 @wait_for_reactor
1915 @inlineCallbacks
1916 def test_calls_update_on_subnet(self):
1917- yield deferToDatabase(register_websocket_triggers)
1918 subnet = yield deferToDatabase(self.create_subnet)
1919 selected_ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
1920 ipaddress = yield deferToDatabase(
1921@@ -3386,14 +3262,13 @@ class TestStaticIPAddressSubnetListener(
1922 self.update_staticipaddress, ipaddress.id, {"ip": selected_ip}
1923 )
1924 yield dv.get(timeout=2)
1925- self.assertEqual(("update", "%s" % subnet.id), dv.value)
1926+ self.assertEqual(("update", str(subnet.id)), dv.value)
1927 finally:
1928 yield listener.stopService()
1929
1930 @wait_for_reactor
1931 @inlineCallbacks
1932 def test_calls_update_on_old_and_new_subnet(self):
1933- yield deferToDatabase(register_websocket_triggers)
1934 old_subnet = yield deferToDatabase(self.create_subnet)
1935 new_subnet = yield deferToDatabase(self.create_subnet)
1936 selected_ip = factory.pick_ip_in_network(new_subnet.get_ipnetwork())
1937@@ -3426,8 +3301,8 @@ class TestStaticIPAddressSubnetListener(
1938 yield dvs[1].get(timeout=2)
1939 self.assertCountEqual(
1940 [
1941- ("update", "%s" % old_subnet.id),
1942- ("update", "%s" % new_subnet.id),
1943+ ("update", str(old_subnet.id)),
1944+ ("update", str(new_subnet.id)),
1945 ],
1946 [dvs[0].value, dvs[1].value],
1947 )
1948@@ -3455,7 +3330,6 @@ class TestMachineBlockDeviceListener(
1949 @wait_for_reactor
1950 @inlineCallbacks
1951 def test_calls_handler_with_update_on_create(self):
1952- yield deferToDatabase(register_websocket_triggers)
1953 node = yield deferToDatabase(self.create_node, self.params)
1954
1955 listener = self.make_listener_without_delay()
1956@@ -3465,14 +3339,13 @@ class TestMachineBlockDeviceListener(
1957 try:
1958 yield deferToDatabase(self.create_blockdevice, {"node": node})
1959 yield dv.get(timeout=2)
1960- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1961+ self.assertEqual(("update", node.system_id), dv.value)
1962 finally:
1963 yield listener.stopService()
1964
1965 @wait_for_reactor
1966 @inlineCallbacks
1967 def test_calls_handler_with_update_on_delete(self):
1968- yield deferToDatabase(register_websocket_triggers)
1969 node = yield deferToDatabase(self.create_node, self.params)
1970 blockdevice = yield deferToDatabase(
1971 self.create_blockdevice, {"node": node}
1972@@ -3485,14 +3358,13 @@ class TestMachineBlockDeviceListener(
1973 try:
1974 yield deferToDatabase(self.delete_blockdevice, blockdevice.id)
1975 yield dv.get(timeout=2)
1976- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1977+ self.assertEqual(("update", node.system_id), dv.value)
1978 finally:
1979 yield listener.stopService()
1980
1981 @wait_for_reactor
1982 @inlineCallbacks
1983 def test_calls_handler_with_update_on_update(self):
1984- yield deferToDatabase(register_websocket_triggers)
1985 node = yield deferToDatabase(self.create_node, self.params)
1986 blockdevice = yield deferToDatabase(
1987 self.create_blockdevice, {"node": node}
1988@@ -3509,14 +3381,13 @@ class TestMachineBlockDeviceListener(
1989 {"size": random.randint(MIN_BLOCK_DEVICE_SIZE, 1000 ** 3)},
1990 )
1991 yield dv.get(timeout=2)
1992- self.assertEqual(("update", "%s" % node.system_id), dv.value)
1993+ self.assertEqual(("update", node.system_id), dv.value)
1994 finally:
1995 yield listener.stopService()
1996
1997 @wait_for_reactor
1998 @inlineCallbacks
1999 def test_calls_handler_with_update_on_physicalblockdevice_update(self):
2000- yield deferToDatabase(register_websocket_triggers)
2001 node = yield deferToDatabase(self.create_node, self.params)
2002 blockdevice = yield deferToDatabase(
2003 self.create_physicalblockdevice, {"node": node}
2004@@ -3533,14 +3404,13 @@ class TestMachineBlockDeviceListener(
2005 {"model": factory.make_name("model")},
2006 )
2007 yield dv.get(timeout=2)
2008- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2009+ self.assertEqual(("update", node.system_id), dv.value)
2010 finally:
2011 yield listener.stopService()
2012
2013 @wait_for_reactor
2014 @inlineCallbacks
2015 def test_calls_handler_with_update_on_virtualblockdevice_update(self):
2016- yield deferToDatabase(register_websocket_triggers)
2017 node = yield deferToDatabase(self.create_node, self.params)
2018 blockdevice = yield deferToDatabase(
2019 self.create_virtualblockdevice,
2020@@ -3558,7 +3428,7 @@ class TestMachineBlockDeviceListener(
2021 {"uuid": factory.make_UUID()},
2022 )
2023 yield dv.get(timeout=2)
2024- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2025+ self.assertEqual(("update", node.system_id), dv.value)
2026 finally:
2027 yield listener.stopService()
2028
2029@@ -3582,7 +3452,6 @@ class TestMachinePartitionTableListener(
2030 @wait_for_reactor
2031 @inlineCallbacks
2032 def test_calls_handler_with_update_on_create(self):
2033- yield deferToDatabase(register_websocket_triggers)
2034 node = yield deferToDatabase(self.create_node, self.params)
2035
2036 listener = self.make_listener_without_delay()
2037@@ -3592,14 +3461,13 @@ class TestMachinePartitionTableListener(
2038 try:
2039 yield deferToDatabase(self.create_partitiontable, {"node": node})
2040 yield dv.get(timeout=2)
2041- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2042+ self.assertEqual(("update", node.system_id), dv.value)
2043 finally:
2044 yield listener.stopService()
2045
2046 @wait_for_reactor
2047 @inlineCallbacks
2048 def test_calls_handler_with_update_on_delete(self):
2049- yield deferToDatabase(register_websocket_triggers)
2050 node = yield deferToDatabase(self.create_node, self.params)
2051 partitiontable = yield deferToDatabase(
2052 self.create_partitiontable, {"node": node}
2053@@ -3614,14 +3482,13 @@ class TestMachinePartitionTableListener(
2054 self.delete_partitiontable, partitiontable.id
2055 )
2056 yield dv.get(timeout=2)
2057- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2058+ self.assertEqual(("update", node.system_id), dv.value)
2059 finally:
2060 yield listener.stopService()
2061
2062 @wait_for_reactor
2063 @inlineCallbacks
2064 def test_calls_handler_with_update_on_update(self):
2065- yield deferToDatabase(register_websocket_triggers)
2066 node = yield deferToDatabase(self.create_node, self.params)
2067 partitiontable = yield deferToDatabase(
2068 self.create_partitiontable, {"node": node}
2069@@ -3640,7 +3507,7 @@ class TestMachinePartitionTableListener(
2070 force_update=True,
2071 )
2072 yield dv.get(timeout=2)
2073- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2074+ self.assertEqual(("update", node.system_id), dv.value)
2075 finally:
2076 yield listener.stopService()
2077
2078@@ -3664,7 +3531,6 @@ class TestMachinePartitionListener(
2079 @wait_for_reactor
2080 @inlineCallbacks
2081 def test_calls_handler_with_update_on_create(self):
2082- yield deferToDatabase(register_websocket_triggers)
2083 node = yield deferToDatabase(self.create_node, self.params)
2084
2085 listener = self.make_listener_without_delay()
2086@@ -3674,14 +3540,13 @@ class TestMachinePartitionListener(
2087 try:
2088 yield deferToDatabase(self.create_partition, {"node": node})
2089 yield dv.get(timeout=2)
2090- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2091+ self.assertEqual(("update", node.system_id), dv.value)
2092 finally:
2093 yield listener.stopService()
2094
2095 @wait_for_reactor
2096 @inlineCallbacks
2097 def test_calls_handler_with_update_on_delete(self):
2098- yield deferToDatabase(register_websocket_triggers)
2099 node = yield deferToDatabase(self.create_node, self.params)
2100 partition = yield deferToDatabase(
2101 self.create_partition, {"node": node}
2102@@ -3694,7 +3559,7 @@ class TestMachinePartitionListener(
2103 try:
2104 yield deferToDatabase(self.delete_partition, partition.id)
2105 yield dv.get(timeout=2)
2106- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2107+ self.assertEqual(("update", node.system_id), dv.value)
2108 finally:
2109 yield listener.stopService()
2110
2111@@ -3702,7 +3567,6 @@ class TestMachinePartitionListener(
2112 @wait_for_reactor
2113 @inlineCallbacks
2114 def test_calls_handler_with_update_on_update(self):
2115- yield deferToDatabase(register_websocket_triggers)
2116 node = yield deferToDatabase(self.create_node, self.params)
2117 partition = yield deferToDatabase(
2118 self.create_partition, {"node": node}
2119@@ -3722,7 +3586,7 @@ class TestMachinePartitionListener(
2120 {"size": random.randint(MIN_PARTITION_SIZE, 1000 ** 3)},
2121 )
2122 yield dv.get(timeout=2)
2123- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2124+ self.assertEqual(("update", node.system_id), dv.value)
2125 finally:
2126 yield listener.stopService()
2127
2128@@ -3742,27 +3606,26 @@ class TestMachineFilesystemListener(
2129
2130 def setUp(self):
2131 super().setUp()
2132- register_websocket_triggers()
2133
2134 def test_calls_handler_with_update_on_create_fs_on_partition(self):
2135 node = factory.make_Node(**self.params)
2136 partition = factory.make_Partition(node=node)
2137 with listenFor(self.channel) as get:
2138 factory.make_Filesystem(partition=partition)
2139- self.assertEqual(("update", "%s" % node.system_id), get())
2140+ self.assertEqual(("update", node.system_id), get())
2141
2142 def test_calls_handler_with_update_on_create_fs_on_block_device(self):
2143 node = factory.make_Node(**self.params)
2144 block_device = factory.make_BlockDevice(node=node)
2145 with listenFor(self.channel) as get:
2146 factory.make_Filesystem(block_device=block_device)
2147- self.assertEqual(("update", "%s" % node.system_id), get())
2148+ self.assertEqual(("update", node.system_id), get())
2149
2150 def test_calls_handler_with_update_on_create_special_fs(self):
2151 node = factory.make_Node(**self.params)
2152 with listenFor(self.channel) as get:
2153 factory.make_Filesystem(node=node)
2154- self.assertEqual(("update", "%s" % node.system_id), get())
2155+ self.assertEqual(("update", node.system_id), get())
2156
2157 def test_calls_handler_with_update_on_delete_fs_on_partition(self):
2158 node = factory.make_Node(**self.params)
2159@@ -3770,7 +3633,7 @@ class TestMachineFilesystemListener(
2160 filesystem = factory.make_Filesystem(partition=partition)
2161 with listenFor(self.channel) as get:
2162 filesystem.delete()
2163- self.assertEqual(("update", "%s" % node.system_id), get())
2164+ self.assertEqual(("update", node.system_id), get())
2165
2166 def test_calls_handler_with_update_on_delete_fs_on_block_device(self):
2167 node = factory.make_Node(**self.params)
2168@@ -3778,14 +3641,14 @@ class TestMachineFilesystemListener(
2169 filesystem = factory.make_Filesystem(block_device=block_device)
2170 with listenFor(self.channel) as get:
2171 filesystem.delete()
2172- self.assertEqual(("update", "%s" % node.system_id), get())
2173+ self.assertEqual(("update", node.system_id), get())
2174
2175 def test_calls_handler_with_update_on_delete_special_fs(self):
2176 node = factory.make_Node(**self.params)
2177 filesystem = factory.make_Filesystem(node=node)
2178 with listenFor(self.channel) as get:
2179 filesystem.delete()
2180- self.assertEqual(("update", "%s" % node.system_id), get())
2181+ self.assertEqual(("update", node.system_id), get())
2182
2183 def test_calls_handler_with_update_on_update_fs_on_partition(self):
2184 node = factory.make_Node(**self.params)
2185@@ -3793,7 +3656,7 @@ class TestMachineFilesystemListener(
2186 filesystem = factory.make_Filesystem(partition=partition)
2187 with listenFor(self.channel) as get:
2188 filesystem.save(force_update=True) # A no-op update is enough.
2189- self.assertEqual(("update", "%s" % node.system_id), get())
2190+ self.assertEqual(("update", node.system_id), get())
2191
2192 def test_calls_handler_with_update_on_update_fs_on_block_device(self):
2193 node = factory.make_Node(**self.params)
2194@@ -3801,14 +3664,14 @@ class TestMachineFilesystemListener(
2195 filesystem = factory.make_Filesystem(block_device=block_device)
2196 with listenFor(self.channel) as get:
2197 filesystem.save(force_update=True) # A no-op update is enough.
2198- self.assertEqual(("update", "%s" % node.system_id), get())
2199+ self.assertEqual(("update", node.system_id), get())
2200
2201 def test_calls_handler_with_update_on_update_special_fs(self):
2202 node = factory.make_Node(**self.params)
2203 filesystem = factory.make_Filesystem(node=node)
2204 with listenFor(self.channel) as get:
2205 filesystem.save(force_update=True) # A no-op update is enough.
2206- self.assertEqual(("update", "%s" % node.system_id), get())
2207+ self.assertEqual(("update", node.system_id), get())
2208
2209
2210 class TestMachineFilesystemgroupListener(
2211@@ -3833,7 +3696,6 @@ class TestMachineFilesystemgroupListener(
2212 @wait_for_reactor
2213 @inlineCallbacks
2214 def test_calls_handler_with_update_on_create(self):
2215- yield deferToDatabase(register_websocket_triggers)
2216 node = yield deferToDatabase(self.create_node, self.params)
2217 yield deferToDatabase(
2218 self.create_partitiontable, {"node": node, "bootable": True}
2219@@ -3846,14 +3708,13 @@ class TestMachineFilesystemgroupListener(
2220 try:
2221 yield deferToDatabase(self.create_filesystemgroup, {"node": node})
2222 yield dv.get(timeout=2)
2223- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2224+ self.assertEqual(("update", node.system_id), dv.value)
2225 finally:
2226 yield listener.stopService()
2227
2228 @wait_for_reactor
2229 @inlineCallbacks
2230 def test_calls_handler_with_update_on_delete(self):
2231- yield deferToDatabase(register_websocket_triggers)
2232 node = yield deferToDatabase(self.create_node, self.params)
2233 yield deferToDatabase(
2234 self.create_partitiontable, {"node": node, "bootable": True}
2235@@ -3871,14 +3732,13 @@ class TestMachineFilesystemgroupListener(
2236 self.delete_filesystemgroup, filesystemgroup.id
2237 )
2238 yield dv.get(timeout=2)
2239- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2240+ self.assertEqual(("update", node.system_id), dv.value)
2241 finally:
2242 yield listener.stopService()
2243
2244 @wait_for_reactor
2245 @inlineCallbacks
2246 def test_calls_handler_with_update_on_update(self):
2247- yield deferToDatabase(register_websocket_triggers)
2248 node = yield deferToDatabase(self.create_node, self.params)
2249 yield deferToDatabase(
2250 self.create_partitiontable, {"node": node, "bootable": True}
2251@@ -3898,7 +3758,7 @@ class TestMachineFilesystemgroupListener(
2252 {"name": factory.make_name("fsgroup")},
2253 )
2254 yield dv.get(timeout=2)
2255- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2256+ self.assertEqual(("update", node.system_id), dv.value)
2257 finally:
2258 yield listener.stopService()
2259
2260@@ -3922,7 +3782,6 @@ class TestMachineCachesetListener(
2261 @wait_for_reactor
2262 @inlineCallbacks
2263 def test_calls_handler_with_update_on_create(self):
2264- yield deferToDatabase(register_websocket_triggers)
2265 node = yield deferToDatabase(self.create_node, self.params)
2266 partition = yield deferToDatabase(
2267 self.create_partition, {"node": node}
2268@@ -3937,14 +3796,13 @@ class TestMachineCachesetListener(
2269 self.create_cacheset, {"node": node, "partition": partition}
2270 )
2271 yield dv.get(timeout=2)
2272- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2273+ self.assertEqual(("update", node.system_id), dv.value)
2274 finally:
2275 yield listener.stopService()
2276
2277 @wait_for_reactor
2278 @inlineCallbacks
2279 def test_calls_handler_with_update_on_delete(self):
2280- yield deferToDatabase(register_websocket_triggers)
2281 node = yield deferToDatabase(self.create_node, self.params)
2282 partition = yield deferToDatabase(
2283 self.create_partition, {"node": node}
2284@@ -3960,14 +3818,13 @@ class TestMachineCachesetListener(
2285 try:
2286 yield deferToDatabase(self.delete_cacheset, cacheset.id)
2287 yield dv.get(timeout=2)
2288- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2289+ self.assertEqual(("update", node.system_id), dv.value)
2290 finally:
2291 yield listener.stopService()
2292
2293 @wait_for_reactor
2294 @inlineCallbacks
2295 def test_calls_handler_with_update_on_update(self):
2296- yield deferToDatabase(register_websocket_triggers)
2297 node = yield deferToDatabase(self.create_node, self.params)
2298 partition = yield deferToDatabase(
2299 self.create_partition, {"node": node}
2300@@ -3986,7 +3843,7 @@ class TestMachineCachesetListener(
2301 self.update_cacheset, cacheset.id, {}, force_update=True
2302 )
2303 yield dv.get(timeout=2)
2304- self.assertEqual(("update", "%s" % node.system_id), dv.value)
2305+ self.assertEqual(("update", node.system_id), dv.value)
2306 finally:
2307 yield listener.stopService()
2308
2309@@ -4000,7 +3857,6 @@ class TestUserTokenListener(
2310 @wait_for_reactor
2311 @inlineCallbacks
2312 def test_calls_handler_with_update_on_create(self):
2313- yield deferToDatabase(register_websocket_triggers)
2314 user = yield deferToDatabase(self.create_user)
2315
2316 listener = self.make_listener_without_delay()
2317@@ -4010,14 +3866,13 @@ class TestUserTokenListener(
2318 try:
2319 yield deferToDatabase(self.create_token, {"user": user})
2320 yield dv.get(timeout=2)
2321- self.assertEqual(("update", "%s" % user.id), dv.value)
2322+ self.assertEqual(("update", str(user.id)), dv.value)
2323 finally:
2324 yield listener.stopService()
2325
2326 @wait_for_reactor
2327 @inlineCallbacks
2328 def test_calls_handler_with_update_on_delete(self):
2329- yield deferToDatabase(register_websocket_triggers)
2330 user = yield deferToDatabase(self.create_user)
2331 token = yield deferToDatabase(self.create_token, {"user": user})
2332
2333@@ -4028,7 +3883,7 @@ class TestUserTokenListener(
2334 try:
2335 yield deferToDatabase(self.delete_token, token.id)
2336 yield dv.get(timeout=2)
2337- self.assertEqual(("update", "%s" % user.id), dv.value)
2338+ self.assertEqual(("update", str(user.id)), dv.value)
2339 finally:
2340 yield listener.stopService()
2341
2342@@ -4042,7 +3897,6 @@ class TestTokenListener(
2343 @wait_for_reactor
2344 @inlineCallbacks
2345 def test_calls_handler_on_create(self):
2346- yield deferToDatabase(register_websocket_triggers)
2347 user = yield deferToDatabase(self.create_user)
2348
2349 listener = self.make_listener_without_delay()
2350@@ -4052,14 +3906,13 @@ class TestTokenListener(
2351 try:
2352 obj = yield deferToDatabase(self.create_token, {"user": user})
2353 yield dv.get(timeout=2)
2354- self.assertEqual(("create", "%s" % obj.id), dv.value)
2355+ self.assertEqual(("create", str(obj.id)), dv.value)
2356 finally:
2357 yield listener.stopService()
2358
2359 @wait_for_reactor
2360 @inlineCallbacks
2361 def test_calls_handler_on_update(self):
2362- yield deferToDatabase(register_websocket_triggers)
2363 user = yield deferToDatabase(self.create_user)
2364 token = yield deferToDatabase(self.create_token, {"user": user})
2365 new_name = factory.make_name("name")
2366@@ -4072,14 +3925,13 @@ class TestTokenListener(
2367 # Force the update because the key contents could be the same.
2368 yield deferToDatabase(self.update_token, token.id, name=new_name)
2369 yield dv.get(timeout=2)
2370- self.assertEqual(("update", "%s" % token.id), dv.value)
2371+ self.assertEqual(("update", str(token.id)), dv.value)
2372 finally:
2373 yield listener.stopService()
2374
2375 @wait_for_reactor
2376 @inlineCallbacks
2377 def test_calls_handler_on_delete(self):
2378- yield deferToDatabase(register_websocket_triggers)
2379 user = yield deferToDatabase(self.create_user)
2380 token = yield deferToDatabase(self.create_token, {"user": user})
2381
2382@@ -4090,7 +3942,7 @@ class TestTokenListener(
2383 try:
2384 yield deferToDatabase(self.delete_token, token.id)
2385 yield dv.get(timeout=2)
2386- self.assertEqual(("delete", "%s" % token.id), dv.value)
2387+ self.assertEqual(("delete", str(token.id)), dv.value)
2388 finally:
2389 yield listener.stopService()
2390
2391@@ -4104,7 +3956,6 @@ class TestUserSSHKeyListener(
2392 @wait_for_reactor
2393 @inlineCallbacks
2394 def test_calls_handler_with_update_on_create(self):
2395- yield deferToDatabase(register_websocket_triggers)
2396 user = yield deferToDatabase(self.create_user)
2397
2398 listener = self.make_listener_without_delay()
2399@@ -4114,14 +3965,13 @@ class TestUserSSHKeyListener(
2400 try:
2401 yield deferToDatabase(self.create_sshkey, {"user": user})
2402 yield dv.get(timeout=2)
2403- self.assertEqual(("update", "%s" % user.id), dv.value)
2404+ self.assertEqual(("update", str(user.id)), dv.value)
2405 finally:
2406 yield listener.stopService()
2407
2408 @wait_for_reactor
2409 @inlineCallbacks
2410 def test_calls_handler_with_update_on_delete(self):
2411- yield deferToDatabase(register_websocket_triggers)
2412 user = yield deferToDatabase(self.create_user)
2413 sshkey = yield deferToDatabase(self.create_sshkey, {"user": user})
2414
2415@@ -4132,7 +3982,7 @@ class TestUserSSHKeyListener(
2416 try:
2417 yield deferToDatabase(self.delete_sshkey, sshkey.id)
2418 yield dv.get(timeout=2)
2419- self.assertEqual(("update", "%s" % user.id), dv.value)
2420+ self.assertEqual(("update", str(user.id)), dv.value)
2421 finally:
2422 yield listener.stopService()
2423
2424@@ -4146,7 +3996,6 @@ class TestSSHKeyListener(
2425 @wait_for_reactor
2426 @inlineCallbacks
2427 def test_calls_handler_on_create(self):
2428- yield deferToDatabase(register_websocket_triggers)
2429 user = yield deferToDatabase(self.create_user)
2430
2431 listener = self.make_listener_without_delay()
2432@@ -4156,14 +4005,13 @@ class TestSSHKeyListener(
2433 try:
2434 obj = yield deferToDatabase(self.create_sshkey, {"user": user})
2435 yield dv.get(timeout=2)
2436- self.assertEqual(("create", "%s" % obj.id), dv.value)
2437+ self.assertEqual(("create", str(obj.id)), dv.value)
2438 finally:
2439 yield listener.stopService()
2440
2441 @wait_for_reactor
2442 @inlineCallbacks
2443 def test_calls_handler_on_update(self):
2444- yield deferToDatabase(register_websocket_triggers)
2445 user = yield deferToDatabase(self.create_user)
2446 sshkey = yield deferToDatabase(self.create_sshkey, {"user": user})
2447 other_sshkey = yield deferToDatabase(
2448@@ -4185,14 +4033,13 @@ class TestSSHKeyListener(
2449 force_update=True,
2450 )
2451 yield dv.get(timeout=2)
2452- self.assertEqual(("update", "%s" % sshkey.id), dv.value)
2453+ self.assertEqual(("update", str(sshkey.id)), dv.value)
2454 finally:
2455 yield listener.stopService()
2456
2457 @wait_for_reactor
2458 @inlineCallbacks
2459 def test_calls_handler_on_delete(self):
2460- yield deferToDatabase(register_websocket_triggers)
2461 user = yield deferToDatabase(self.create_user)
2462 sshkey = yield deferToDatabase(self.create_sshkey, {"user": user})
2463
2464@@ -4203,7 +4050,7 @@ class TestSSHKeyListener(
2465 try:
2466 yield deferToDatabase(self.delete_sshkey, sshkey.id)
2467 yield dv.get(timeout=2)
2468- self.assertEqual(("delete", "%s" % sshkey.id), dv.value)
2469+ self.assertEqual(("delete", str(sshkey.id)), dv.value)
2470 finally:
2471 yield listener.stopService()
2472
2473@@ -4217,7 +4064,6 @@ class TestUserSSLKeyListener(
2474 @wait_for_reactor
2475 @inlineCallbacks
2476 def test_calls_handler_with_update_on_create(self):
2477- yield deferToDatabase(register_websocket_triggers)
2478 user = yield deferToDatabase(self.create_user)
2479
2480 listener = self.make_listener_without_delay()
2481@@ -4227,14 +4073,13 @@ class TestUserSSLKeyListener(
2482 try:
2483 yield deferToDatabase(self.create_sslkey, {"user": user})
2484 yield dv.get(timeout=2)
2485- self.assertEqual(("update", "%s" % user.id), dv.value)
2486+ self.assertEqual(("update", str(user.id)), dv.value)
2487 finally:
2488 yield listener.stopService()
2489
2490 @wait_for_reactor
2491 @inlineCallbacks
2492 def test_calls_handler_with_update_on_delete(self):
2493- yield deferToDatabase(register_websocket_triggers)
2494 user = yield deferToDatabase(self.create_user)
2495 sslkey = yield deferToDatabase(self.create_sslkey, {"user": user})
2496
2497@@ -4245,7 +4090,7 @@ class TestUserSSLKeyListener(
2498 try:
2499 yield deferToDatabase(self.delete_sslkey, sslkey.id)
2500 yield dv.get(timeout=2)
2501- self.assertEqual(("update", "%s" % user.id), dv.value)
2502+ self.assertEqual(("update", str(user.id)), dv.value)
2503 finally:
2504 yield listener.stopService()
2505
2506@@ -4259,7 +4104,6 @@ class TestSSLKeyListener(
2507 @wait_for_reactor
2508 @inlineCallbacks
2509 def test_calls_handler_on_create(self):
2510- yield deferToDatabase(register_websocket_triggers)
2511 user = yield deferToDatabase(self.create_user)
2512
2513 listener = self.make_listener_without_delay()
2514@@ -4276,7 +4120,6 @@ class TestSSLKeyListener(
2515 @wait_for_reactor
2516 @inlineCallbacks
2517 def test_calls_handler_on_update(self):
2518- yield deferToDatabase(register_websocket_triggers)
2519 user = yield deferToDatabase(self.create_user)
2520 sslkey = yield deferToDatabase(self.create_sslkey, {"user": user})
2521 other_sslkey = yield deferToDatabase(
2522@@ -4306,7 +4149,6 @@ class TestSSLKeyListener(
2523 @wait_for_reactor
2524 @inlineCallbacks
2525 def test_calls_handler_on_delete(self):
2526- yield deferToDatabase(register_websocket_triggers)
2527 user = yield deferToDatabase(self.create_user)
2528 sslkey = yield deferToDatabase(self.create_sslkey, {"user": user})
2529
2530@@ -4331,7 +4173,6 @@ class TestDHCPSnippetListener(
2531 @wait_for_reactor
2532 @inlineCallbacks
2533 def test_calls_handler_on_create_notification(self):
2534- yield deferToDatabase(register_websocket_triggers)
2535 listener = self.make_listener_without_delay()
2536 dv = DeferredValue()
2537 listener.register("dhcpsnippet", lambda *args: dv.set(args))
2538@@ -4339,14 +4180,13 @@ class TestDHCPSnippetListener(
2539 try:
2540 snippet = yield deferToDatabase(self.create_dhcp_snippet)
2541 yield dv.get(timeout=2)
2542- self.assertEqual(("create", "%s" % snippet.id), dv.value)
2543+ self.assertEqual(("create", str(snippet.id)), dv.value)
2544 finally:
2545 yield listener.stopService()
2546
2547 @wait_for_reactor
2548 @inlineCallbacks
2549 def test_calls_handler_on_update_notification(self):
2550- yield deferToDatabase(register_websocket_triggers)
2551 listener = self.make_listener_without_delay()
2552 dv = DeferredValue()
2553 listener.register("dhcpsnippet", lambda *args: dv.set(args))
2554@@ -4360,14 +4200,13 @@ class TestDHCPSnippetListener(
2555 {"name": factory.make_name("name")},
2556 )
2557 yield dv.get(timeout=2)
2558- self.assertEqual(("update", "%s" % snippet.id), dv.value)
2559+ self.assertEqual(("update", str(snippet.id)), dv.value)
2560 finally:
2561 yield listener.stopService()
2562
2563 @wait_for_reactor
2564 @inlineCallbacks
2565 def test_calls_handler_on_delete_notification(self):
2566- yield deferToDatabase(register_websocket_triggers)
2567 listener = self.make_listener_without_delay()
2568 dv = DeferredValue()
2569 listener.register("dhcpsnippet", lambda *args: dv.set(args))
2570@@ -4376,7 +4215,7 @@ class TestDHCPSnippetListener(
2571 try:
2572 yield deferToDatabase(self.delete_dhcp_snippet, snippet.id)
2573 yield dv.get(timeout=2)
2574- self.assertEqual(("delete", "%s" % snippet.id), dv.value)
2575+ self.assertEqual(("delete", str(snippet.id)), dv.value)
2576 finally:
2577 yield listener.stopService()
2578
2579@@ -4390,7 +4229,6 @@ class TestPackageRepositoryListener(
2580 @wait_for_reactor
2581 @inlineCallbacks
2582 def test_calls_handler_on_create_notification(self):
2583- yield deferToDatabase(register_websocket_triggers)
2584 listener = self.make_listener_without_delay()
2585 dv = DeferredValue()
2586 listener.register("packagerepository", lambda *args: dv.set(args))
2587@@ -4398,14 +4236,13 @@ class TestPackageRepositoryListener(
2588 try:
2589 repository = yield deferToDatabase(self.create_package_repository)
2590 yield dv.get(timeout=2)
2591- self.assertEqual(("create", "%s" % repository.id), dv.value)
2592+ self.assertEqual(("create", str(repository.id)), dv.value)
2593 finally:
2594 yield listener.stopService()
2595
2596 @wait_for_reactor
2597 @inlineCallbacks
2598 def test_calls_handler_on_update_notification(self):
2599- yield deferToDatabase(register_websocket_triggers)
2600 listener = self.make_listener_without_delay()
2601 dv = DeferredValue()
2602 listener.register("packagerepository", lambda *args: dv.set(args))
2603@@ -4419,14 +4256,13 @@ class TestPackageRepositoryListener(
2604 {"name": factory.make_name("name")},
2605 )
2606 yield dv.get(timeout=2)
2607- self.assertEqual(("update", "%s" % repository.id), dv.value)
2608+ self.assertEqual(("update", str(repository.id)), dv.value)
2609 finally:
2610 yield listener.stopService()
2611
2612 @wait_for_reactor
2613 @inlineCallbacks
2614 def test_calls_handler_on_delete_notification(self):
2615- yield deferToDatabase(register_websocket_triggers)
2616 listener = self.make_listener_without_delay()
2617 dv = DeferredValue()
2618 listener.register("packagerepository", lambda *args: dv.set(args))
2619@@ -4437,7 +4273,7 @@ class TestPackageRepositoryListener(
2620 self.delete_package_repository, repository.id
2621 )
2622 yield dv.get(timeout=2)
2623- self.assertEqual(("delete", "%s" % repository.id), dv.value)
2624+ self.assertEqual(("delete", str(repository.id)), dv.value)
2625 finally:
2626 yield listener.stopService()
2627
2628@@ -4451,7 +4287,6 @@ class TestIPRangeSubnetListener(
2629 @wait_for_reactor
2630 @inlineCallbacks
2631 def test_calls_handler_on_create_notification(self):
2632- yield deferToDatabase(register_websocket_triggers)
2633 subnet = yield deferToDatabase(
2634 self.create_subnet,
2635 {
2636@@ -4476,14 +4311,13 @@ class TestIPRangeSubnetListener(
2637 },
2638 )
2639 yield dv.get(timeout=2)
2640- self.assertEqual(("update", "%s" % iprange.subnet.id), dv.value)
2641+ self.assertEqual(("update", str(iprange.subnet.id)), dv.value)
2642 finally:
2643 yield listener.stopService()
2644
2645 @wait_for_reactor
2646 @inlineCallbacks
2647 def test_calls_handler_on_update_notification(self):
2648- yield deferToDatabase(register_websocket_triggers)
2649 iprange = yield deferToDatabase(self.create_iprange)
2650 new_end_ip = factory.pick_ip_in_IPRange(
2651 iprange, but_not=[iprange.start_ip, iprange.end_ip]
2652@@ -4498,14 +4332,13 @@ class TestIPRangeSubnetListener(
2653 self.update_iprange, iprange.id, {"end_ip": new_end_ip}
2654 )
2655 yield dv.get(timeout=2)
2656- self.assertEqual(("update", "%s" % iprange.subnet.id), dv.value)
2657+ self.assertEqual(("update", str(iprange.subnet.id)), dv.value)
2658 finally:
2659 yield listener.stopService()
2660
2661 @wait_for_reactor
2662 @inlineCallbacks
2663 def test_calls_handler_on_update_on_old_and_new_subnet_notification(self):
2664- yield deferToDatabase(register_websocket_triggers)
2665 old_subnet = yield deferToDatabase(
2666 self.create_subnet,
2667 {
2668@@ -4557,8 +4390,8 @@ class TestIPRangeSubnetListener(
2669 yield dvs[1].get(timeout=2)
2670 self.assertCountEqual(
2671 [
2672- ("update", "%s" % old_subnet.id),
2673- ("update", "%s" % new_subnet.id),
2674+ ("update", str(old_subnet.id)),
2675+ ("update", str(new_subnet.id)),
2676 ],
2677 [dvs[0].value, dvs[1].value],
2678 )
2679@@ -4568,7 +4401,6 @@ class TestIPRangeSubnetListener(
2680 @wait_for_reactor
2681 @inlineCallbacks
2682 def test_calls_handler_on_delete_notification(self):
2683- yield deferToDatabase(register_websocket_triggers)
2684 iprange = yield deferToDatabase(self.create_iprange)
2685
2686 listener = self.make_listener_without_delay()
2687@@ -4578,7 +4410,7 @@ class TestIPRangeSubnetListener(
2688 try:
2689 yield deferToDatabase(self.delete_iprange, iprange.id)
2690 yield dv.get(timeout=2)
2691- self.assertEqual(("update", "%s" % iprange.subnet.id), dv.value)
2692+ self.assertEqual(("update", str(iprange.subnet.id)), dv.value)
2693 finally:
2694 yield listener.stopService()
2695
2696@@ -4592,7 +4424,6 @@ class TestPodListener(
2697 @wait_for_reactor
2698 @inlineCallbacks
2699 def test_calls_handler_on_create_notification(self):
2700- yield deferToDatabase(register_websocket_triggers)
2701
2702 listener = self.make_listener_without_delay()
2703 dv = DeferredValue()
2704@@ -4603,14 +4434,13 @@ class TestPodListener(
2705 self.create_pod, {"name": factory.make_name("pod")}
2706 )
2707 yield dv.get(timeout=2)
2708- self.assertEqual(("create", "%s" % pod.id), dv.value)
2709+ self.assertEqual(("create", str(pod.id)), dv.value)
2710 finally:
2711 yield listener.stopService()
2712
2713 @wait_for_reactor
2714 @inlineCallbacks
2715 def test_calls_handler_on_update_same_bmc_types_notification(self):
2716- yield deferToDatabase(register_websocket_triggers)
2717 pod = yield deferToDatabase(
2718 self.create_pod, {"name": factory.make_name("pod")}
2719 )
2720@@ -4624,7 +4454,7 @@ class TestPodListener(
2721 self.update_pod, pod.id, {"name": factory.make_name("pod")}
2722 )
2723 yield dv.get(timeout=2)
2724- self.assertEqual(("update", "%s" % pod.id), dv.value)
2725+ self.assertEqual(("update", str(pod.id)), dv.value)
2726 finally:
2727 yield listener.stopService()
2728
2729@@ -4634,7 +4464,6 @@ class TestPodListener(
2730 bmc = yield deferToDatabase(
2731 self.create_bmc, {"name": factory.make_name("bmc")}
2732 )
2733- yield deferToDatabase(register_websocket_triggers)
2734
2735 listener = self.make_listener_without_delay()
2736 dv = DeferredValue()
2737@@ -4645,7 +4474,7 @@ class TestPodListener(
2738 self.update_bmc, bmc.id, {"bmc_type": BMC_TYPE.POD}
2739 )
2740 yield dv.get(timeout=2)
2741- self.assertEqual(("create", "%s" % bmc.id), dv.value)
2742+ self.assertEqual(("create", str(bmc.id)), dv.value)
2743 finally:
2744 yield listener.stopService()
2745
2746@@ -4655,7 +4484,6 @@ class TestPodListener(
2747 pod = yield deferToDatabase(
2748 self.create_pod, {"name": factory.make_name("pod")}
2749 )
2750- yield deferToDatabase(register_websocket_triggers)
2751
2752 listener = self.make_listener_without_delay()
2753 dv = DeferredValue()
2754@@ -4666,7 +4494,7 @@ class TestPodListener(
2755 self.update_pod, pod.id, {"bmc_type": BMC_TYPE.BMC}
2756 )
2757 yield dv.get(timeout=2)
2758- self.assertEqual(("delete", "%s" % pod.id), dv.value)
2759+ self.assertEqual(("delete", str(pod.id)), dv.value)
2760 finally:
2761 yield listener.stopService()
2762
2763@@ -4676,7 +4504,6 @@ class TestPodListener(
2764 pod = yield deferToDatabase(
2765 self.create_pod, {"name": factory.make_name("pod")}
2766 )
2767- yield deferToDatabase(register_websocket_triggers)
2768
2769 listener = self.make_listener_without_delay()
2770 dv = DeferredValue()
2771@@ -4685,7 +4512,7 @@ class TestPodListener(
2772 try:
2773 yield deferToDatabase(self.delete_pod, pod.id)
2774 yield dv.get(timeout=2)
2775- self.assertEqual(("delete", "%s" % pod.id), dv.value)
2776+ self.assertEqual(("delete", str(pod.id)), dv.value)
2777 finally:
2778 yield listener.stopService()
2779
2780@@ -4695,7 +4522,6 @@ class TestPodListener(
2781 pod, host = yield deferToDatabase(
2782 self.create_pod_with_host, {"name": factory.make_name("pod")}
2783 )
2784- yield deferToDatabase(register_websocket_triggers)
2785
2786 listener = self.make_listener_without_delay()
2787 dv = DeferredValue()
2788@@ -4704,7 +4530,7 @@ class TestPodListener(
2789 try:
2790 yield deferToDatabase(lambda: factory.make_Interface(node=host))
2791 yield dv.get(timeout=2)
2792- self.assertEqual(("update", "%s" % pod.id), dv.value)
2793+ self.assertEqual(("update", str(pod.id)), dv.value)
2794 finally:
2795 yield listener.stopService()
2796
2797@@ -4714,7 +4540,6 @@ class TestPodListener(
2798 pod, host = yield deferToDatabase(
2799 self.create_pod_with_host, {"name": factory.make_name("pod")}
2800 )
2801- yield deferToDatabase(register_websocket_triggers)
2802 interface = yield deferToDatabase(
2803 lambda: factory.make_Interface(node=host)
2804 )
2805@@ -4731,7 +4556,7 @@ class TestPodListener(
2806 try:
2807 yield deferToDatabase(_change_vlan, interface)
2808 yield dv.get(timeout=2)
2809- self.assertEqual(("update", "%s" % pod.id), dv.value)
2810+ self.assertEqual(("update", str(pod.id)), dv.value)
2811 finally:
2812 yield listener.stopService()
2813
2814@@ -4741,7 +4566,6 @@ class TestPodListener(
2815 pod, host = yield deferToDatabase(
2816 self.create_pod_with_host, {"name": factory.make_name("pod")}
2817 )
2818- yield deferToDatabase(register_websocket_triggers)
2819 interface = yield deferToDatabase(
2820 lambda: factory.make_Interface(node=host)
2821 )
2822@@ -4758,7 +4582,7 @@ class TestPodListener(
2823 try:
2824 yield deferToDatabase(_change_interface_node, interface)
2825 yield dv.get(timeout=2)
2826- self.assertEqual(("update", "%s" % pod.id), dv.value)
2827+ self.assertEqual(("update", str(pod.id)), dv.value)
2828 finally:
2829 yield listener.stopService()
2830
2831@@ -4768,7 +4592,6 @@ class TestPodListener(
2832 pod, host = yield deferToDatabase(
2833 self.create_pod_with_host, {"name": factory.make_name("pod")}
2834 )
2835- yield deferToDatabase(register_websocket_triggers)
2836 interface = yield deferToDatabase(
2837 lambda: factory.make_Interface(node=host)
2838 )
2839@@ -4780,7 +4603,7 @@ class TestPodListener(
2840 try:
2841 yield deferToDatabase(interface.delete)
2842 yield dv.get(timeout=2)
2843- self.assertEqual(("update", "%s" % pod.id), dv.value)
2844+ self.assertEqual(("update", str(pod.id)), dv.value)
2845 finally:
2846 yield listener.stopService()
2847
2848@@ -4794,7 +4617,6 @@ class TestNodePodListener(
2849 @wait_for_reactor
2850 @inlineCallbacks
2851 def test_calls_handler_on_create_notification(self):
2852- yield deferToDatabase(register_websocket_triggers)
2853 pod = yield deferToDatabase(self.create_pod)
2854
2855 listener = self.make_listener_without_delay()
2856@@ -4804,7 +4626,7 @@ class TestNodePodListener(
2857 try:
2858 yield deferToDatabase(self.create_node, {"bmc": pod})
2859 yield dv.get(timeout=2)
2860- self.assertEqual(("update", "%s" % pod.id), dv.value)
2861+ self.assertEqual(("update", str(pod.id)), dv.value)
2862 finally:
2863 yield listener.stopService()
2864
2865@@ -4818,7 +4640,6 @@ class TestNodePodListener(
2866 self.create_pod, {"name": factory.make_name("pod")}
2867 )
2868 node = yield deferToDatabase(self.create_node, {"bmc": old_pod})
2869- yield deferToDatabase(register_websocket_triggers)
2870 dvs = [DeferredValue(), DeferredValue()]
2871
2872 def set_defer_value(*args):
2873@@ -4840,7 +4661,7 @@ class TestNodePodListener(
2874 yield dvs[0].get(timeout=2)
2875 yield dvs[1].get(timeout=2)
2876 self.assertCountEqual(
2877- [("update", "%s" % old_pod.id), ("update", "%s" % new_pod.id)],
2878+ [("update", str(old_pod.id)), ("update", str(new_pod.id))],
2879 [dvs[0].value, dvs[1].value],
2880 )
2881 finally:
2882@@ -4849,7 +4670,6 @@ class TestNodePodListener(
2883 @wait_for_reactor
2884 @inlineCallbacks
2885 def test_calls_handler_on_delete_notification(self):
2886- yield deferToDatabase(register_websocket_triggers)
2887 pod = yield deferToDatabase(self.create_pod)
2888 node = yield deferToDatabase(self.create_node, {"bmc": pod})
2889
2890@@ -4860,7 +4680,7 @@ class TestNodePodListener(
2891 try:
2892 yield deferToDatabase(self.delete_node, node.system_id)
2893 yield dv.get(timeout=2)
2894- self.assertEqual(("update", "%s" % pod.id), dv.value)
2895+ self.assertEqual(("update", str(pod.id)), dv.value)
2896 finally:
2897 yield listener.stopService()
2898
2899@@ -5002,7 +4822,6 @@ class TestNodeTypeChange(
2900 @wait_for_reactor
2901 @inlineCallbacks
2902 def test_transition_notifies(self):
2903- yield deferToDatabase(register_websocket_triggers)
2904 listener1 = self.make_listener_without_delay()
2905 listener2 = self.make_listener_without_delay()
2906 node = yield deferToDatabase(
2907@@ -5052,7 +4871,6 @@ class TestNotificationListener(
2908 @wait_for_reactor
2909 @inlineCallbacks
2910 def test_calls_handler_on_create_notification(self):
2911- yield deferToDatabase(register_websocket_triggers)
2912 listener = self.make_listener_without_delay()
2913 dv = DeferredValue()
2914 listener.register("notification", lambda *args: dv.set(args))
2915@@ -5060,14 +4878,13 @@ class TestNotificationListener(
2916 try:
2917 notification = yield deferToDatabase(factory.make_Notification)
2918 yield dv.get(timeout=2)
2919- self.assertEqual(("create", "%s" % notification.id), dv.value)
2920+ self.assertEqual(("create", str(notification.id)), dv.value)
2921 finally:
2922 yield listener.stopService()
2923
2924 @wait_for_reactor
2925 @inlineCallbacks
2926 def test_calls_handler_on_update_notification(self):
2927- yield deferToDatabase(register_websocket_triggers)
2928 listener = self.make_listener_without_delay()
2929 dv = DeferredValue()
2930 listener.register("notification", lambda *args: dv.set(args))
2931@@ -5082,14 +4899,13 @@ class TestNotificationListener(
2932 try:
2933 yield deferToDatabase(update_notification, notification)
2934 yield dv.get(timeout=2)
2935- self.assertEqual(("update", "%s" % notification.id), dv.value)
2936+ self.assertEqual(("update", str(notification.id)), dv.value)
2937 finally:
2938 yield listener.stopService()
2939
2940 @wait_for_reactor
2941 @inlineCallbacks
2942 def test_calls_handler_on_delete_notification(self):
2943- yield deferToDatabase(register_websocket_triggers)
2944 listener = self.make_listener_without_delay()
2945 dv = DeferredValue()
2946 listener.register("notification", lambda *args: dv.set(args))
2947@@ -5099,7 +4915,7 @@ class TestNotificationListener(
2948 try:
2949 yield deferToDatabase(notification.delete)
2950 yield dv.get(timeout=2)
2951- self.assertEqual(("delete", "%s" % notification_id), dv.value)
2952+ self.assertEqual(("delete", str(notification_id)), dv.value)
2953 finally:
2954 yield listener.stopService()
2955
2956@@ -5115,7 +4931,6 @@ class TestNotificationDismissalListener(
2957 @wait_for_reactor
2958 @inlineCallbacks
2959 def test_calls_handler_on_create_notification(self):
2960- yield deferToDatabase(register_websocket_triggers)
2961 listener = self.make_listener_without_delay()
2962 dv = DeferredValue()
2963 listener.register("notificationdismissal", lambda *args: dv.set(args))
2964@@ -5142,7 +4957,6 @@ class TestScriptListener(
2965 @inlineCallbacks
2966 def test_calls_handler_on_create_notification(self):
2967 yield deferToDatabase(load_builtin_scripts)
2968- yield deferToDatabase(register_websocket_triggers)
2969 listener = self.make_listener_without_delay()
2970 dv = DeferredValue()
2971 listener.register("script", lambda *args: dv.set(args))
2972@@ -5150,7 +4964,7 @@ class TestScriptListener(
2973 try:
2974 script = yield deferToDatabase(self.create_script)
2975 yield dv.get(timeout=2)
2976- self.assertEqual(("create", "%s" % script.id), dv.value)
2977+ self.assertEqual(("create", str(script.id)), dv.value)
2978 finally:
2979 yield listener.stopService()
2980
2981@@ -5158,7 +4972,6 @@ class TestScriptListener(
2982 @inlineCallbacks
2983 def test_calls_handler_on_update_notification(self):
2984 yield deferToDatabase(load_builtin_scripts)
2985- yield deferToDatabase(register_websocket_triggers)
2986 listener = self.make_listener_without_delay()
2987 dv = DeferredValue()
2988 listener.register("script", lambda *args: dv.set(args))
2989@@ -5172,7 +4985,7 @@ class TestScriptListener(
2990 {"name": factory.make_name("name")},
2991 )
2992 yield dv.get(timeout=2)
2993- self.assertEqual(("update", "%s" % script.id), dv.value)
2994+ self.assertEqual(("update", str(script.id)), dv.value)
2995 finally:
2996 yield listener.stopService()
2997
2998@@ -5180,7 +4993,6 @@ class TestScriptListener(
2999 @inlineCallbacks
3000 def test_calls_handler_on_delete_notification(self):
3001 yield deferToDatabase(load_builtin_scripts)
3002- yield deferToDatabase(register_websocket_triggers)
3003 listener = self.make_listener_without_delay()
3004 dv = DeferredValue()
3005 listener.register("script", lambda *args: dv.set(args))
3006@@ -5189,7 +5001,7 @@ class TestScriptListener(
3007 try:
3008 yield deferToDatabase(self.delete_script, script.id)
3009 yield dv.get(timeout=2)
3010- self.assertEqual(("delete", "%s" % script.id), dv.value)
3011+ self.assertEqual(("delete", str(script.id)), dv.value)
3012 finally:
3013 yield listener.stopService()
3014
3015@@ -5200,7 +5012,6 @@ class TestNodeDeviceListener(
3016 @wait_for_reactor
3017 @inlineCallbacks
3018 def test_calls_handler_on_create_notification(self):
3019- yield deferToDatabase(register_websocket_triggers)
3020 node = yield deferToDatabase(self.create_node)
3021 listener = self.make_listener_without_delay()
3022 dv = DeferredValue()
3023@@ -5211,14 +5022,13 @@ class TestNodeDeviceListener(
3024 self.create_node_device, {"node": node}
3025 )
3026 yield dv.get(timeout=2)
3027- self.assertEqual(("create", "%s" % node_device.id), dv.value)
3028+ self.assertEqual(("create", str(node_device.id)), dv.value)
3029 finally:
3030 yield listener.stopService()
3031
3032 @wait_for_reactor
3033 @inlineCallbacks
3034 def test_calls_handler_on_update_notification(self):
3035- yield deferToDatabase(register_websocket_triggers)
3036 listener = self.make_listener_without_delay()
3037 dv = DeferredValue()
3038 listener.register("nodedevice", lambda *args: dv.set(args))
3039@@ -5236,14 +5046,13 @@ class TestNodeDeviceListener(
3040 },
3041 )
3042 yield dv.get(timeout=2)
3043- self.assertEqual(("update", "%s" % node_device.id), dv.value)
3044+ self.assertEqual(("update", str(node_device.id)), dv.value)
3045 finally:
3046 yield listener.stopService()
3047
3048 @wait_for_reactor
3049 @inlineCallbacks
3050 def test_calls_handler_on_delete_notification(self):
3051- yield deferToDatabase(register_websocket_triggers)
3052 listener = self.make_listener_without_delay()
3053 dv = DeferredValue()
3054 listener.register("nodedevice", lambda *args: dv.set(args))
3055@@ -5252,6 +5061,6 @@ class TestNodeDeviceListener(
3056 try:
3057 yield deferToDatabase(self.delete_node_device, node_device.id)
3058 yield dv.get(timeout=2)
3059- self.assertEqual(("delete", "%s" % node_device.id), dv.value)
3060+ self.assertEqual(("delete", str(node_device.id)), dv.value)
3061 finally:
3062 yield listener.stopService()

Subscribers

People subscribed via source and target branches