Merge lp:~jseutter/landscape-client/assert-equal into lp:~landscape/landscape-client/trunk
- assert-equal
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Alberto Donato |
Approved revision: | no longer in the source branch. |
Merge reported by: | Jerry Seutter |
Merged at revision: | not available |
Proposed branch: | lp:~jseutter/landscape-client/assert-equal |
Merge into: | lp:~landscape/landscape-client/trunk |
Diff against target: |
12957 lines (+2542/-2548) 96 files modified
landscape/broker/tests/test_amp.py (+2/-2) landscape/broker/tests/test_client.py (+8/-8) landscape/broker/tests/test_config.py (+10/-10) landscape/broker/tests/test_exchange.py (+116/-116) landscape/broker/tests/test_exchangestore.py (+10/-10) landscape/broker/tests/test_ping.py (+22/-18) landscape/broker/tests/test_server.py (+16/-16) landscape/broker/tests/test_service.py (+8/-8) landscape/broker/tests/test_store.py (+58/-58) landscape/broker/tests/test_transport.py (+27/-25) landscape/lib/tests/test_amp.py (+10/-13) landscape/lib/tests/test_bootstrap.py (+1/-1) landscape/lib/tests/test_bpickle.py (+14/-15) landscape/lib/tests/test_bpickle_dbus.py (+3/-3) landscape/lib/tests/test_command.py (+10/-10) landscape/lib/tests/test_disk.py (+5/-5) landscape/lib/tests/test_fd.py (+4/-3) landscape/lib/tests/test_fetch.py (+126/-124) landscape/lib/tests/test_fs.py (+5/-5) landscape/lib/tests/test_gpg.py (+5/-4) landscape/lib/tests/test_lsb_release.py (+7/-7) landscape/lib/tests/test_monitor.py (+27/-27) landscape/lib/tests/test_persist.py (+37/-37) landscape/lib/tests/test_process.py (+8/-8) landscape/lib/tests/test_scriptcontent.py (+6/-5) landscape/lib/tests/test_sequenceranges.py (+79/-79) landscape/lib/tests/test_sysstats.py (+51/-50) landscape/lib/tests/test_timestamp.py (+2/-2) landscape/lib/tests/test_warning.py (+2/-2) landscape/manager/tests/test_config.py (+6/-6) landscape/manager/tests/test_customgraph.py (+32/-31) landscape/manager/tests/test_packagemanager.py (+6/-6) landscape/manager/tests/test_processkiller.py (+1/-1) landscape/manager/tests/test_scriptexecution.py (+25/-25) landscape/manager/tests/test_service.py (+2/-2) landscape/manager/tests/test_shutdownmanager.py (+7/-7) landscape/manager/tests/test_store.py (+9/-9) landscape/manager/tests/test_usermanager.py (+106/-113) landscape/monitor/tests/test_activeprocessinfo.py (+47/-47) landscape/monitor/tests/test_aptpreferences.py (+17/-17) landscape/monitor/tests/test_computerinfo.py (+42/-42) landscape/monitor/tests/test_computeruptime.py (+58/-58) landscape/monitor/tests/test_config.py (+4/-4) landscape/monitor/tests/test_hardwareinventory.py (+38/-38) landscape/monitor/tests/test_loadaverage.py (+10/-10) landscape/monitor/tests/test_memoryinfo.py (+8/-8) landscape/monitor/tests/test_monitor.py (+4/-4) landscape/monitor/tests/test_mountinfo.py (+97/-97) landscape/monitor/tests/test_networkactivity.py (+6/-6) landscape/monitor/tests/test_networkdevice.py (+4/-4) landscape/monitor/tests/test_packagemonitor.py (+9/-9) landscape/monitor/tests/test_plugin.py (+9/-9) landscape/monitor/tests/test_processorinfo.py (+87/-85) landscape/monitor/tests/test_rebootrequired.py (+7/-7) landscape/monitor/tests/test_service.py (+2/-2) landscape/monitor/tests/test_temperature.py (+20/-20) landscape/monitor/tests/test_usermonitor.py (+2/-3) landscape/package/tests/test_changer.py (+49/-49) landscape/package/tests/test_facade.py (+72/-72) landscape/package/tests/test_interface.py (+7/-7) landscape/package/tests/test_releaseupgrader.py (+63/-63) landscape/package/tests/test_reporter.py (+76/-76) landscape/package/tests/test_skeleton.py (+6/-7) landscape/package/tests/test_store.py (+109/-115) landscape/package/tests/test_taskhandler.py (+21/-23) landscape/sysinfo/tests/test_deployment.py (+3/-3) landscape/sysinfo/tests/test_disk.py (+39/-39) landscape/sysinfo/tests/test_landscapelink.py (+1/-1) landscape/sysinfo/tests/test_load.py (+2/-2) landscape/sysinfo/tests/test_loggedinusers.py (+10/-7) landscape/sysinfo/tests/test_memory.py (+3/-4) landscape/sysinfo/tests/test_network.py (+1/-1) landscape/sysinfo/tests/test_processes.py (+8/-7) landscape/sysinfo/tests/test_sysinfo.py (+107/-106) landscape/sysinfo/tests/test_temperature.py (+6/-6) landscape/tests/test_accumulate.py (+28/-28) landscape/tests/test_configuration.py (+18/-20) landscape/tests/test_deployment.py (+46/-46) landscape/tests/test_diff.py (+8/-8) landscape/tests/test_hal.py (+8/-8) landscape/tests/test_log.py (+20/-20) landscape/tests/test_patch.py (+29/-30) landscape/tests/test_plugin.py (+3/-3) landscape/tests/test_reactor.py (+48/-38) landscape/tests/test_schema.py (+41/-51) landscape/tests/test_service.py (+1/-1) landscape/tests/test_sysvconfig.py (+2/-2) landscape/tests/test_textmessage.py (+8/-8) landscape/tests/test_watchdog.py (+62/-63) landscape/upgraders/tests/test_broker.py (+1/-1) landscape/upgraders/tests/test_legacy.py (+37/-37) landscape/upgraders/tests/test_monitor.py (+1/-1) landscape/upgraders/tests/test_package.py (+1/-1) landscape/user/tests/test_changes.py (+50/-50) landscape/user/tests/test_management.py (+54/-54) landscape/user/tests/test_provider.py (+149/-149) |
To merge this branch: | bzr merge lp:~jseutter/landscape-client/assert-equal |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alberto Donato (community) | Approve | ||
Free Ekanayaka (community) | Approve | ||
Review via email: mp+66955@code.launchpad.net |
Commit message
Description of the change
This MP contains changes to test files only.
- Replace assertEquals with assertEqual. assertEquals use is discouraged.
- PEP8 and lint cleanups.
Some PEP8 violations remain because of sample data.
Some lint warnings remain because of try: import except: snippets (for Dapper sqlite3 support?):
landscape/
landscape/
landscape/
landscape/
- 339. By Alberto Donato
-
Merge sources.
list-preserve- old-permissions [f=804548] [r=bigkevmcd, therve] - 340. By Jerry Seutter
-
Test file refactoring only. Refactored assertEquals -> assertEqual and
did some PEP8 and lint cleanups.
[r=ack,free] [f=805746]
Preview Diff
1 | === modified file 'landscape/broker/tests/test_amp.py' |
2 | --- landscape/broker/tests/test_amp.py 2010-04-23 09:44:28 +0000 |
3 | +++ landscape/broker/tests/test_amp.py 2011-07-06 21:14:28 +0000 |
4 | @@ -126,8 +126,8 @@ |
5 | """ |
6 | |
7 | def assert_response(response): |
8 | - self.assertEquals(response, None) |
9 | - self.assertEquals( |
10 | + self.assertEqual(response, None) |
11 | + self.assertEqual( |
12 | self.exchanger.get_client_accepted_message_types(), |
13 | sorted(["type"] + DEFAULT_ACCEPTED_TYPES)) |
14 | |
15 | |
16 | === modified file 'landscape/broker/tests/test_client.py' |
17 | --- landscape/broker/tests/test_client.py 2010-05-12 13:48:30 +0000 |
18 | +++ landscape/broker/tests/test_client.py 2011-07-06 21:14:28 +0000 |
19 | @@ -34,7 +34,7 @@ |
20 | plugins = [BrokerClientPlugin(), BrokerClientPlugin()] |
21 | self.client.add(plugins[0]) |
22 | self.client.add(plugins[1]) |
23 | - self.assertEquals(self.client.get_plugins(), plugins) |
24 | + self.assertEqual(self.client.get_plugins(), plugins) |
25 | |
26 | def test_get_plugins_returns_a_copy(self): |
27 | """ |
28 | @@ -43,7 +43,7 @@ |
29 | """ |
30 | plugins = self.client.get_plugins() |
31 | plugins.append(BrokerClientPlugin()) |
32 | - self.assertEquals(self.client.get_plugins(), []) |
33 | + self.assertEqual(self.client.get_plugins(), []) |
34 | |
35 | def test_get_named_plugin(self): |
36 | """ |
37 | @@ -53,7 +53,7 @@ |
38 | plugin = BrokerClientPlugin() |
39 | plugin.plugin_name = "foo" |
40 | self.client.add(plugin) |
41 | - self.assertEquals(self.client.get_plugin("foo"), plugin) |
42 | + self.assertEqual(self.client.get_plugin("foo"), plugin) |
43 | |
44 | def test_run_interval(self): |
45 | """ |
46 | @@ -89,7 +89,7 @@ |
47 | result2 = self.client.register_message("bar", lambda m: None) |
48 | |
49 | def got_result(result): |
50 | - self.assertEquals( |
51 | + self.assertEqual( |
52 | self.exchanger.get_client_accepted_message_types(), |
53 | sorted(["bar", "foo"] + DEFAULT_ACCEPTED_TYPES)) |
54 | |
55 | @@ -106,7 +106,7 @@ |
56 | self.mocker.replay() |
57 | |
58 | def dispatch_message(result): |
59 | - self.assertEquals(self.client.dispatch_message(message), 123) |
60 | + self.assertEqual(self.client.dispatch_message(message), 123) |
61 | |
62 | result = self.client.register_message("foo", handle_message) |
63 | return result.addCallback(dispatch_message) |
64 | @@ -138,7 +138,7 @@ |
65 | """ |
66 | error = self.assertRaises(HandlerNotFoundError, |
67 | self.client.dispatch_message, {"type": "x"}) |
68 | - self.assertEquals(str(error), "x") |
69 | + self.assertEqual(str(error), "x") |
70 | |
71 | def test_message(self): |
72 | """ |
73 | @@ -152,7 +152,7 @@ |
74 | self.mocker.replay() |
75 | |
76 | def dispatch_message(result): |
77 | - self.assertEquals(self.client.message(message), True) |
78 | + self.assertEqual(self.client.message(message), True) |
79 | |
80 | result = self.client.register_message("foo", handle_message) |
81 | return result.addCallback(dispatch_message) |
82 | @@ -163,7 +163,7 @@ |
83 | handler was found. |
84 | """ |
85 | message = {"type": "foo"} |
86 | - self.assertEquals(self.client.message(message), False) |
87 | + self.assertEqual(self.client.message(message), False) |
88 | |
89 | def test_exchange(self): |
90 | """ |
91 | |
92 | === modified file 'landscape/broker/tests/test_config.py' |
93 | --- landscape/broker/tests/test_config.py 2010-04-12 11:40:06 +0000 |
94 | +++ landscape/broker/tests/test_config.py 2011-07-06 21:14:28 +0000 |
95 | @@ -22,8 +22,8 @@ |
96 | configuration.load(["--http-proxy", "foo", |
97 | "--https-proxy", "bar", |
98 | "--url", "whatever"]) |
99 | - self.assertEquals(os.environ["http_proxy"], "foo") |
100 | - self.assertEquals(os.environ["https_proxy"], "bar") |
101 | + self.assertEqual(os.environ["http_proxy"], "foo") |
102 | + self.assertEqual(os.environ["https_proxy"], "bar") |
103 | |
104 | def test_loading_without_http_proxies_does_not_touch_environment(self): |
105 | """ |
106 | @@ -36,8 +36,8 @@ |
107 | |
108 | configuration = BrokerConfiguration() |
109 | configuration.load(["--url", "whatever"]) |
110 | - self.assertEquals(os.environ["http_proxy"], "heyo") |
111 | - self.assertEquals(os.environ["https_proxy"], "baroo") |
112 | + self.assertEqual(os.environ["http_proxy"], "heyo") |
113 | + self.assertEqual(os.environ["https_proxy"], "baroo") |
114 | |
115 | def test_loading_resets_http_proxies(self): |
116 | """ |
117 | @@ -55,12 +55,12 @@ |
118 | configuration.load(["--http-proxy", "x", |
119 | "--https-proxy", "y", |
120 | "--url", "whatever"]) |
121 | - self.assertEquals(os.environ["http_proxy"], "x") |
122 | - self.assertEquals(os.environ["https_proxy"], "y") |
123 | + self.assertEqual(os.environ["http_proxy"], "x") |
124 | + self.assertEqual(os.environ["https_proxy"], "y") |
125 | |
126 | configuration.load(["--url", "whatever"]) |
127 | - self.assertEquals(os.environ["http_proxy"], "original") |
128 | - self.assertEquals(os.environ["https_proxy"], "originals") |
129 | + self.assertEqual(os.environ["http_proxy"], "original") |
130 | + self.assertEqual(os.environ["https_proxy"], "originals") |
131 | |
132 | def test_intervals_are_ints(self): |
133 | """ |
134 | @@ -74,5 +74,5 @@ |
135 | configuration = BrokerConfiguration() |
136 | configuration.load(["--config", filename, "--url", "whatever"]) |
137 | |
138 | - self.assertEquals(configuration.urgent_exchange_interval, 12) |
139 | - self.assertEquals(configuration.exchange_interval, 34) |
140 | + self.assertEqual(configuration.urgent_exchange_interval, 12) |
141 | + self.assertEqual(configuration.exchange_interval, 34) |
142 | |
143 | === modified file 'landscape/broker/tests/test_exchange.py' |
144 | --- landscape/broker/tests/test_exchange.py 2011-03-25 08:42:48 +0000 |
145 | +++ landscape/broker/tests/test_exchange.py 2011-07-06 21:14:28 +0000 |
146 | @@ -47,11 +47,11 @@ |
147 | self.mstore.set_accepted_types(["empty"]) |
148 | self.exchanger.send({"type": "empty"}) |
149 | self.exchanger.exchange() |
150 | - self.assertEquals(len(self.transport.payloads), 1) |
151 | + self.assertEqual(len(self.transport.payloads), 1) |
152 | messages = self.transport.payloads[0]["messages"] |
153 | - self.assertEquals(messages, [{"type": "empty", |
154 | - "timestamp": 0, |
155 | - "api": SERVER_API}]) |
156 | + self.assertEqual(messages, [{"type": "empty", |
157 | + "timestamp": 0, |
158 | + "api": SERVER_API}]) |
159 | |
160 | def test_send_urgent(self): |
161 | """ |
162 | @@ -61,7 +61,7 @@ |
163 | self.mstore.set_accepted_types(["empty"]) |
164 | self.exchanger.send({"type": "empty"}, urgent=True) |
165 | self.wait_for_exchange(urgent=True) |
166 | - self.assertEquals(len(self.transport.payloads), 1) |
167 | + self.assertEqual(len(self.transport.payloads), 1) |
168 | self.assertMessages(self.transport.payloads[0]["messages"], |
169 | [{"type": "empty"}]) |
170 | |
171 | @@ -75,7 +75,7 @@ |
172 | self.wait_for_exchange(urgent=True, factor=0.5) |
173 | self.exchanger.send({"type": "empty"}, urgent=True) |
174 | self.wait_for_exchange(urgent=True, factor=0.5) |
175 | - self.assertEquals(len(self.transport.payloads), 1) |
176 | + self.assertEqual(len(self.transport.payloads), 1) |
177 | self.assertMessages(self.transport.payloads[0]["messages"], |
178 | [{"type": "empty"}, {"type": "empty"}]) |
179 | |
180 | @@ -96,7 +96,7 @@ |
181 | """ |
182 | payload = self.exchanger.make_payload() |
183 | self.assertTrue("accepted-types" in payload) |
184 | - self.assertEquals(payload["accepted-types"], md5("").digest()) |
185 | + self.assertEqual(payload["accepted-types"], md5("").digest()) |
186 | |
187 | def test_set_accepted_types(self): |
188 | """ |
189 | @@ -105,7 +105,7 @@ |
190 | """ |
191 | self.exchanger.handle_message( |
192 | {"type": "accepted-types", "types": ["foo"]}) |
193 | - self.assertEquals(self.mstore.get_accepted_types(), ["foo"]) |
194 | + self.assertEqual(self.mstore.get_accepted_types(), ["foo"]) |
195 | |
196 | def test_message_type_acceptance_changed_event(self): |
197 | stash = [] |
198 | @@ -117,8 +117,8 @@ |
199 | {"type": "accepted-types", "types": ["a", "b"]}) |
200 | self.exchanger.handle_message( |
201 | {"type": "accepted-types", "types": ["b", "c"]}) |
202 | - self.assertEquals(stash, [("a", True), ("b", True), |
203 | - ("a", False), ("c", True)]) |
204 | + self.assertEqual(stash, [("a", True), ("b", True), |
205 | + ("a", False), ("c", True)]) |
206 | |
207 | def test_accepted_types_roundtrip(self): |
208 | """ |
209 | @@ -129,8 +129,8 @@ |
210 | {"type": "accepted-types", "types": ["ack", "bar"]}) |
211 | payload = self.exchanger.make_payload() |
212 | self.assertTrue("accepted-types" in payload) |
213 | - self.assertEquals(payload["accepted-types"], |
214 | - md5("ack;bar").digest()) |
215 | + self.assertEqual(payload["accepted-types"], |
216 | + md5("ack;bar").digest()) |
217 | |
218 | def test_accepted_types_causes_urgent_if_held_messages_exist(self): |
219 | """ |
220 | @@ -138,11 +138,11 @@ |
221 | have a held message, an urgent exchange should occur. |
222 | """ |
223 | self.exchanger.send({"type": "holdme"}) |
224 | - self.assertEquals(self.mstore.get_pending_messages(), []) |
225 | + self.assertEqual(self.mstore.get_pending_messages(), []) |
226 | self.exchanger.handle_message( |
227 | {"type": "accepted-types", "types": ["holdme"]}) |
228 | self.wait_for_exchange(urgent=True) |
229 | - self.assertEquals(len(self.transport.payloads), 1) |
230 | + self.assertEqual(len(self.transport.payloads), 1) |
231 | self.assertMessages(self.transport.payloads[0]["messages"], |
232 | [{"type": "holdme"}]) |
233 | |
234 | @@ -152,10 +152,10 @@ |
235 | then no urgent exchange should occur. |
236 | """ |
237 | self.exchanger.send({"type": "holdme"}) |
238 | - self.assertEquals(self.transport.payloads, []) |
239 | + self.assertEqual(self.transport.payloads, []) |
240 | self.reactor.fire("message", |
241 | {"type": "accepted-types", "types": ["irrelevant"]}) |
242 | - self.assertEquals(len(self.transport.payloads), 0) |
243 | + self.assertEqual(len(self.transport.payloads), 0) |
244 | |
245 | def test_sequence_is_committed_immediately(self): |
246 | """ |
247 | @@ -174,13 +174,13 @@ |
248 | def handler(message): |
249 | persist = Persist(filename=self.persist_filename) |
250 | store = MessageStore(persist, self.config.message_store_path) |
251 | - self.assertEquals(store.get_pending_offset(), 1) |
252 | - self.assertEquals(store.get_sequence(), 1) |
253 | + self.assertEqual(store.get_pending_offset(), 1) |
254 | + self.assertEqual(store.get_sequence(), 1) |
255 | handled.append(True) |
256 | |
257 | self.exchanger.register_message("inbound", handler) |
258 | self.exchanger.exchange() |
259 | - self.assertEquals(handled, [True], self.logfile.getvalue()) |
260 | + self.assertEqual(handled, [True], self.logfile.getvalue()) |
261 | |
262 | def test_messages_from_server_commit(self): |
263 | """ |
264 | @@ -194,14 +194,14 @@ |
265 | def handler(message): |
266 | Persist(filename=self.persist_filename) |
267 | store = MessageStore(self.persist, self.config.message_store_path) |
268 | - self.assertEquals(store.get_server_sequence(), |
269 | - self.message_counter) |
270 | + self.assertEqual(store.get_server_sequence(), |
271 | + self.message_counter) |
272 | self.message_counter += 1 |
273 | handled.append(True) |
274 | |
275 | self.exchanger.register_message("inbound", handler) |
276 | self.exchanger.exchange() |
277 | - self.assertEquals(handled, [True] * 3, self.logfile.getvalue()) |
278 | + self.assertEqual(handled, [True] * 3, self.logfile.getvalue()) |
279 | |
280 | def test_messages_from_server_causing_urgent_exchanges(self): |
281 | """ |
282 | @@ -219,11 +219,11 @@ |
283 | |
284 | self.exchanger.exchange() |
285 | |
286 | - self.assertEquals(len(self.transport.payloads), 1) |
287 | + self.assertEqual(len(self.transport.payloads), 1) |
288 | |
289 | self.wait_for_exchange(urgent=True) |
290 | |
291 | - self.assertEquals(len(self.transport.payloads), 2) |
292 | + self.assertEqual(len(self.transport.payloads), 2) |
293 | self.assertMessages(self.transport.payloads[1]["messages"], |
294 | [{"type": "empty"}]) |
295 | |
296 | @@ -236,7 +236,7 @@ |
297 | self.mstore.add({"type": "data", "data": 0}) |
298 | self.mstore.add({"type": "data", "data": 1}) |
299 | self.exchanger.exchange() |
300 | - self.assertEquals(self.mstore.get_sequence(), 2) |
301 | + self.assertEqual(self.mstore.get_sequence(), 2) |
302 | |
303 | self.mstore.add({"type": "data", "data": 2}) |
304 | self.mstore.add({"type": "data", "data": 3}) |
305 | @@ -248,7 +248,7 @@ |
306 | |
307 | self.transport.exchange = desynched_send_data |
308 | self.exchanger.exchange() |
309 | - self.assertEquals(self.mstore.get_sequence(), 1) |
310 | + self.assertEqual(self.mstore.get_sequence(), 1) |
311 | del self.transport.exchange |
312 | |
313 | exchanged = [] |
314 | @@ -258,15 +258,15 @@ |
315 | |
316 | self.reactor.call_on("exchange-done", exchange_callback) |
317 | self.wait_for_exchange(urgent=True) |
318 | - self.assertEquals(exchanged, [True]) |
319 | + self.assertEqual(exchanged, [True]) |
320 | |
321 | payload = self.transport.payloads[-1] |
322 | self.assertMessages(payload["messages"], |
323 | [{"type": "data", "data": 1}, |
324 | {"type": "data", "data": 2}, |
325 | {"type": "data", "data": 3}]) |
326 | - self.assertEquals(payload["sequence"], 1) |
327 | - self.assertEquals(payload["next-expected-sequence"], 0) |
328 | + self.assertEqual(payload["sequence"], 1) |
329 | + self.assertEqual(payload["next-expected-sequence"], 0) |
330 | |
331 | def test_start_with_urgent_exchange(self): |
332 | """ |
333 | @@ -278,7 +278,7 @@ |
334 | self.config) |
335 | exchanger.start() |
336 | self.wait_for_exchange(urgent=True) |
337 | - self.assertEquals(len(transport.payloads), 1) |
338 | + self.assertEqual(len(transport.payloads), 1) |
339 | |
340 | def test_reschedule_after_exchange(self): |
341 | """ |
342 | @@ -288,13 +288,13 @@ |
343 | self.exchanger.schedule_exchange(urgent=True) |
344 | |
345 | self.wait_for_exchange(urgent=True) |
346 | - self.assertEquals(len(self.transport.payloads), 1) |
347 | - |
348 | - self.wait_for_exchange() |
349 | - self.assertEquals(len(self.transport.payloads), 2) |
350 | - |
351 | - self.wait_for_exchange() |
352 | - self.assertEquals(len(self.transport.payloads), 3) |
353 | + self.assertEqual(len(self.transport.payloads), 1) |
354 | + |
355 | + self.wait_for_exchange() |
356 | + self.assertEqual(len(self.transport.payloads), 2) |
357 | + |
358 | + self.wait_for_exchange() |
359 | + self.assertEqual(len(self.transport.payloads), 3) |
360 | |
361 | def test_leave_urgent_exchange_mode_after_exchange(self): |
362 | """ |
363 | @@ -304,9 +304,9 @@ |
364 | self.mstore.set_accepted_types(["empty"]) |
365 | self.exchanger.send({"type": "empty"}, urgent=True) |
366 | self.wait_for_exchange(urgent=True) |
367 | - self.assertEquals(len(self.transport.payloads), 1) |
368 | + self.assertEqual(len(self.transport.payloads), 1) |
369 | self.wait_for_exchange(urgent=True) |
370 | - self.assertEquals(len(self.transport.payloads), 1) # no change |
371 | + self.assertEqual(len(self.transport.payloads), 1) # no change |
372 | |
373 | def test_ancient_causes_resynchronize(self): |
374 | """ |
375 | @@ -388,7 +388,7 @@ |
376 | self.transport.exchange = desynched_send_data |
377 | self.exchanger.exchange() |
378 | |
379 | - self.assertEquals(self.mstore.get_sequence(), 0) |
380 | + self.assertEqual(self.mstore.get_sequence(), 0) |
381 | del self.transport.exchange |
382 | |
383 | exchanged = [] |
384 | @@ -398,9 +398,9 @@ |
385 | |
386 | self.reactor.call_on("exchange-done", exchange_callback) |
387 | self.wait_for_exchange(urgent=True) |
388 | - self.assertEquals(exchanged, []) |
389 | + self.assertEqual(exchanged, []) |
390 | self.wait_for_exchange() |
391 | - self.assertEquals(exchanged, [True]) |
392 | + self.assertEqual(exchanged, [True]) |
393 | |
394 | def test_old_sequence_id_does_not_cause_resynchronize(self): |
395 | resynchronized = [] |
396 | @@ -414,7 +414,7 @@ |
397 | self.transport.next_expected_sequence = 0 |
398 | |
399 | self.exchanger.exchange() |
400 | - self.assertEquals(resynchronized, []) |
401 | + self.assertEqual(resynchronized, []) |
402 | |
403 | def test_per_api_payloads(self): |
404 | """ |
405 | @@ -433,9 +433,9 @@ |
406 | # the client API. |
407 | payload = self.transport.payloads[-1] |
408 | self.assertMessages(payload["messages"], []) |
409 | - self.assertEquals(payload.get("client-api"), CLIENT_API) |
410 | - self.assertEquals(payload.get("server-api"), SERVER_API) |
411 | - self.assertEquals(self.transport.message_api, SERVER_API) |
412 | + self.assertEqual(payload.get("client-api"), CLIENT_API) |
413 | + self.assertEqual(payload.get("server-api"), SERVER_API) |
414 | + self.assertEqual(self.transport.message_api, SERVER_API) |
415 | |
416 | self.mstore.add({"type": "a", "api": "1.0"}) |
417 | self.mstore.add({"type": "b", "api": "1.0"}) |
418 | @@ -452,9 +452,9 @@ |
419 | self.assertMessages(payload["messages"], |
420 | [{"type": "a", "api": "1.0"}, |
421 | {"type": "b", "api": "1.0"}]) |
422 | - self.assertEquals(payload.get("client-api"), CLIENT_API) |
423 | - self.assertEquals(payload.get("server-api"), "1.0") |
424 | - self.assertEquals(self.transport.message_api, "1.0") |
425 | + self.assertEqual(payload.get("client-api"), CLIENT_API) |
426 | + self.assertEqual(payload.get("server-api"), "1.0") |
427 | + self.assertEqual(self.transport.message_api, "1.0") |
428 | |
429 | self.exchanger.exchange() |
430 | |
431 | @@ -462,9 +462,9 @@ |
432 | self.assertMessages(payload["messages"], |
433 | [{"type": "c", "api": "1.1"}, |
434 | {"type": "d", "api": "1.1"}]) |
435 | - self.assertEquals(payload.get("client-api"), CLIENT_API) |
436 | - self.assertEquals(payload.get("server-api"), "1.1") |
437 | - self.assertEquals(self.transport.message_api, "1.1") |
438 | + self.assertEqual(payload.get("client-api"), CLIENT_API) |
439 | + self.assertEqual(payload.get("server-api"), "1.1") |
440 | + self.assertEqual(self.transport.message_api, "1.1") |
441 | |
442 | self.exchanger.exchange() |
443 | |
444 | @@ -472,9 +472,9 @@ |
445 | self.assertMessages(payload["messages"], |
446 | [{"type": "e", "api": None}, |
447 | {"type": "f", "api": None}]) |
448 | - self.assertEquals(payload.get("client-api"), CLIENT_API) |
449 | - self.assertEquals(payload.get("server-api"), "2.0") |
450 | - self.assertEquals(self.transport.message_api, "2.0") |
451 | + self.assertEqual(payload.get("client-api"), CLIENT_API) |
452 | + self.assertEqual(payload.get("server-api"), "2.0") |
453 | + self.assertEqual(self.transport.message_api, "2.0") |
454 | |
455 | def test_include_total_messages_none(self): |
456 | """ |
457 | @@ -483,7 +483,7 @@ |
458 | """ |
459 | self.mstore.set_accepted_types(["empty"]) |
460 | self.exchanger.exchange() |
461 | - self.assertEquals(self.transport.payloads[0]["total-messages"], 0) |
462 | + self.assertEqual(self.transport.payloads[0]["total-messages"], 0) |
463 | |
464 | def test_include_total_messages_some(self): |
465 | """ |
466 | @@ -493,7 +493,7 @@ |
467 | self.mstore.set_accepted_types(["empty"]) |
468 | self.mstore.add({"type": "empty"}) |
469 | self.exchanger.exchange() |
470 | - self.assertEquals(self.transport.payloads[0]["total-messages"], 1) |
471 | + self.assertEqual(self.transport.payloads[0]["total-messages"], 1) |
472 | |
473 | def test_include_total_messages_more(self): |
474 | """ |
475 | @@ -508,7 +508,7 @@ |
476 | self.mstore.add({"type": "empty"}) |
477 | self.mstore.add({"type": "empty"}) |
478 | exchanger.exchange() |
479 | - self.assertEquals(self.transport.payloads[0]["total-messages"], 2) |
480 | + self.assertEqual(self.transport.payloads[0]["total-messages"], 2) |
481 | |
482 | def test_impending_exchange(self): |
483 | """ |
484 | @@ -519,9 +519,9 @@ |
485 | events = [] |
486 | self.reactor.call_on("impending-exchange", lambda: events.append(True)) |
487 | self.wait_for_exchange(delta=-11) |
488 | - self.assertEquals(events, []) |
489 | + self.assertEqual(events, []) |
490 | self.reactor.advance(1) |
491 | - self.assertEquals(events, [True]) |
492 | + self.assertEqual(events, [True]) |
493 | |
494 | def test_impending_exchange_on_urgent(self): |
495 | """ |
496 | @@ -539,9 +539,9 @@ |
497 | events = [] |
498 | self.reactor.call_on("impending-exchange", lambda: events.append(True)) |
499 | self.reactor.advance(9) |
500 | - self.assertEquals(events, []) |
501 | + self.assertEqual(events, []) |
502 | self.reactor.advance(1) |
503 | - self.assertEquals(events, [True]) |
504 | + self.assertEqual(events, [True]) |
505 | |
506 | def test_impending_exchange_gets_reschudeled_with_urgent_reschedule(self): |
507 | """ |
508 | @@ -568,9 +568,9 @@ |
509 | # * schedule impending-exchange to be fired in 10 seconds |
510 | exchanger.schedule_exchange(urgent=True) |
511 | self.reactor.advance(10) |
512 | - self.assertEquals(events, [True]) |
513 | + self.assertEqual(events, [True]) |
514 | self.reactor.advance(10) |
515 | - self.assertEquals(len(self.transport.payloads), 1) |
516 | + self.assertEqual(len(self.transport.payloads), 1) |
517 | # Now the urgent exchange should be fired, which should automatically |
518 | # schedule a regular exchange. |
519 | # Let's make sure that that *original* impending-exchange event has |
520 | @@ -578,14 +578,14 @@ |
521 | self.reactor.advance(60 * 60 # time till exchange |
522 | - 10 # time till notification |
523 | - 20) # time that we've already advanced |
524 | - self.assertEquals(events, [True]) |
525 | + self.assertEqual(events, [True]) |
526 | # Ok, so no new events means that the original call was |
527 | # cancelled. great. |
528 | # Just a bit more sanity checking: |
529 | self.reactor.advance(20) |
530 | - self.assertEquals(events, [True, True]) |
531 | + self.assertEqual(events, [True, True]) |
532 | self.reactor.advance(10) |
533 | - self.assertEquals(len(self.transport.payloads), 2) |
534 | + self.assertEqual(len(self.transport.payloads), 2) |
535 | |
536 | def test_pre_exchange_event(self): |
537 | reactor_mock = self.mocker.patch(self.reactor) |
538 | @@ -623,7 +623,7 @@ |
539 | |
540 | self.reactor.call_on("exchange-failed", exchange_failed_callback) |
541 | self.exchanger.exchange() |
542 | - self.assertEquals(exchanged, [True]) |
543 | + self.assertEqual(exchanged, [True]) |
544 | |
545 | def test_stop(self): |
546 | self.exchanger.schedule_exchange() |
547 | @@ -645,7 +645,7 @@ |
548 | self.assertFalse(self.transport.payloads) |
549 | |
550 | def test_default_exchange_intervals(self): |
551 | - self.assertEquals(self.exchanger.get_exchange_intervals(), (60, 900)) |
552 | + self.assertEqual(self.exchanger.get_exchange_intervals(), (60, 900)) |
553 | |
554 | def test_set_intervals(self): |
555 | """ |
556 | @@ -659,15 +659,15 @@ |
557 | |
558 | self.exchanger.exchange() |
559 | |
560 | - self.assertEquals(self.exchanger.get_exchange_intervals(), |
561 | - (1234, 5678)) |
562 | - self.assertEquals(self.config.exchange_interval, 5678) |
563 | - self.assertEquals(self.config.urgent_exchange_interval, 1234) |
564 | + self.assertEqual(self.exchanger.get_exchange_intervals(), |
565 | + (1234, 5678)) |
566 | + self.assertEqual(self.config.exchange_interval, 5678) |
567 | + self.assertEqual(self.config.urgent_exchange_interval, 1234) |
568 | |
569 | new_config = BrokerConfiguration() |
570 | new_config.load_configuration_file(self.config_filename) |
571 | - self.assertEquals(new_config.exchange_interval, 5678) |
572 | - self.assertEquals(new_config.urgent_exchange_interval, 1234) |
573 | + self.assertEqual(new_config.exchange_interval, 5678) |
574 | + self.assertEqual(new_config.urgent_exchange_interval, 1234) |
575 | |
576 | def test_set_intervals_with_urgent_exchange_only(self): |
577 | server_message = [{"type": "set-intervals", "urgent-exchange": 1234}] |
578 | @@ -675,14 +675,14 @@ |
579 | |
580 | self.exchanger.exchange() |
581 | |
582 | - self.assertEquals(self.exchanger.get_exchange_intervals(), (1234, 900)) |
583 | + self.assertEqual(self.exchanger.get_exchange_intervals(), (1234, 900)) |
584 | |
585 | # Let's make sure it works. |
586 | self.exchanger.schedule_exchange(urgent=True) |
587 | self.reactor.advance(1233) |
588 | - self.assertEquals(len(self.transport.payloads), 1) |
589 | + self.assertEqual(len(self.transport.payloads), 1) |
590 | self.reactor.advance(1) |
591 | - self.assertEquals(len(self.transport.payloads), 2) |
592 | + self.assertEqual(len(self.transport.payloads), 2) |
593 | |
594 | def test_set_intervals_with_exchange_only(self): |
595 | server_message = [{"type": "set-intervals", "exchange": 5678}] |
596 | @@ -690,13 +690,13 @@ |
597 | |
598 | self.exchanger.exchange() |
599 | |
600 | - self.assertEquals(self.exchanger.get_exchange_intervals(), (60, 5678)) |
601 | + self.assertEqual(self.exchanger.get_exchange_intervals(), (60, 5678)) |
602 | |
603 | # Let's make sure it works. |
604 | self.reactor.advance(5677) |
605 | - self.assertEquals(len(self.transport.payloads), 1) |
606 | + self.assertEqual(len(self.transport.payloads), 1) |
607 | self.reactor.advance(1) |
608 | - self.assertEquals(len(self.transport.payloads), 2) |
609 | + self.assertEqual(len(self.transport.payloads), 2) |
610 | |
611 | def test_register_message(self): |
612 | """ |
613 | @@ -709,7 +709,7 @@ |
614 | server_message = [msg] |
615 | self.transport.responses.append(server_message) |
616 | self.exchanger.exchange() |
617 | - self.assertEquals(messages, [msg]) |
618 | + self.assertEqual(messages, [msg]) |
619 | |
620 | def test_register_multiple_message_handlers(self): |
621 | """ |
622 | @@ -731,15 +731,15 @@ |
623 | server_message = [msg] |
624 | self.transport.responses.append(server_message) |
625 | self.exchanger.exchange() |
626 | - self.assertEquals(messages, [("one", msg), ("two", msg)]) |
627 | + self.assertEqual(messages, [("one", msg), ("two", msg)]) |
628 | |
629 | def test_server_uuid_is_stored_on_message_store(self): |
630 | self.transport.extra["server-uuid"] = "first-uuid" |
631 | self.exchanger.exchange() |
632 | - self.assertEquals(self.mstore.get_server_uuid(), "first-uuid") |
633 | + self.assertEqual(self.mstore.get_server_uuid(), "first-uuid") |
634 | self.transport.extra["server-uuid"] = "second-uuid" |
635 | self.exchanger.exchange() |
636 | - self.assertEquals(self.mstore.get_server_uuid(), "second-uuid") |
637 | + self.assertEqual(self.mstore.get_server_uuid(), "second-uuid") |
638 | |
639 | def test_server_uuid_change_cause_event(self): |
640 | called = [] |
641 | @@ -752,25 +752,25 @@ |
642 | # letting the system know about the change. |
643 | self.transport.extra["server-uuid"] = "first-uuid" |
644 | self.exchanger.exchange() |
645 | - self.assertEquals(len(called), 1) |
646 | - self.assertEquals(called[-1], (None, "first-uuid")) |
647 | + self.assertEqual(len(called), 1) |
648 | + self.assertEqual(called[-1], (None, "first-uuid")) |
649 | |
650 | # Using the same one again, nothing should happen: |
651 | self.transport.extra["server-uuid"] = "first-uuid" |
652 | self.exchanger.exchange() |
653 | - self.assertEquals(len(called), 1) |
654 | + self.assertEqual(len(called), 1) |
655 | |
656 | # Changing it, we should get an event again: |
657 | self.transport.extra["server-uuid"] = "second-uuid" |
658 | self.exchanger.exchange() |
659 | - self.assertEquals(len(called), 2) |
660 | - self.assertEquals(called[-1], ("first-uuid", "second-uuid")) |
661 | + self.assertEqual(len(called), 2) |
662 | + self.assertEqual(called[-1], ("first-uuid", "second-uuid")) |
663 | |
664 | # And then, it shouldn't emit it once more, since it continues |
665 | # to be the same. |
666 | self.transport.extra["server-uuid"] = "second-uuid" |
667 | self.exchanger.exchange() |
668 | - self.assertEquals(len(called), 2) |
669 | + self.assertEqual(len(called), 2) |
670 | |
671 | def test_server_uuid_event_not_emitted_with_matching_stored_uuid(self): |
672 | """ |
673 | @@ -786,7 +786,7 @@ |
674 | self.mstore.set_server_uuid("the-uuid") |
675 | self.transport.extra["server-uuid"] = "the-uuid" |
676 | self.exchanger.exchange() |
677 | - self.assertEquals(called, []) |
678 | + self.assertEqual(called, []) |
679 | |
680 | def test_server_uuid_change_is_logged(self): |
681 | self.transport.extra["server-uuid"] = "the-uuid" |
682 | @@ -819,8 +819,8 @@ |
683 | self.exchange_store.get_message_context(message['operation-id'])) |
684 | message_context = self.exchange_store.get_message_context( |
685 | message['operation-id']) |
686 | - self.assertEquals(message_context.operation_id, 123456) |
687 | - self.assertEquals(message_context.message_type, "type-R") |
688 | + self.assertEqual(message_context.operation_id, 123456) |
689 | + self.assertEqual(message_context.message_type, "type-R") |
690 | |
691 | def test_one_way_messages_do_not_have_their_context_stored(self): |
692 | """ |
693 | @@ -835,7 +835,7 @@ |
694 | self.exchanger.exchange() |
695 | |
696 | ids_after = self.exchange_store.all_operation_ids() |
697 | - self.assertEquals(ids_before, ids_after) |
698 | + self.assertEqual(ids_before, ids_after) |
699 | |
700 | def test_obsolete_response_messages_are_discarded(self): |
701 | """ |
702 | @@ -859,9 +859,9 @@ |
703 | message_id = self.exchanger.send( |
704 | {"type": "resynchronize", "operation-id": 234567}) |
705 | self.exchanger.exchange() |
706 | - self.assertEquals(2, len(self.transport.payloads)) |
707 | + self.assertEqual(2, len(self.transport.payloads)) |
708 | messages = self.transport.payloads[1]["messages"] |
709 | - self.assertEquals([], messages) |
710 | + self.assertEqual([], messages) |
711 | self.assertIs(None, message_id) |
712 | expected_log_entry = ( |
713 | "Response message with operation-id 234567 was discarded because " |
714 | @@ -894,15 +894,15 @@ |
715 | self.exchanger.register_client_accepted_message_type("type-C") |
716 | self.exchanger.register_client_accepted_message_type("type-A") |
717 | types = self.exchanger.get_client_accepted_message_types() |
718 | - self.assertEquals(types, |
719 | - sorted(["type-A", "type-B", "type-C"] + |
720 | - DEFAULT_ACCEPTED_TYPES)) |
721 | + self.assertEqual(types, |
722 | + sorted(["type-A", "type-B", "type-C"] + |
723 | + DEFAULT_ACCEPTED_TYPES)) |
724 | |
725 | def test_exchange_sends_message_type_when_no_hash(self): |
726 | self.exchanger.register_client_accepted_message_type("type-A") |
727 | self.exchanger.register_client_accepted_message_type("type-B") |
728 | self.exchanger.exchange() |
729 | - self.assertEquals( |
730 | + self.assertEqual( |
731 | self.transport.payloads[0]["client-accepted-types"], |
732 | sorted(["type-A", "type-B"] + DEFAULT_ACCEPTED_TYPES)) |
733 | |
734 | @@ -926,7 +926,7 @@ |
735 | self.exchanger.register_client_accepted_message_type("type-B") |
736 | self.exchanger.exchange() |
737 | self.exchanger.exchange() |
738 | - self.assertEquals( |
739 | + self.assertEqual( |
740 | self.transport.payloads[1]["client-accepted-types"], |
741 | sorted(["type-A", "type-B"] + DEFAULT_ACCEPTED_TYPES)) |
742 | |
743 | @@ -941,7 +941,7 @@ |
744 | self.exchanger.exchange() |
745 | self.exchanger.register_client_accepted_message_type("type-B") |
746 | self.exchanger.exchange() |
747 | - self.assertEquals( |
748 | + self.assertEqual( |
749 | self.transport.payloads[1]["client-accepted-types"], |
750 | sorted(["type-A", "type-B"] + DEFAULT_ACCEPTED_TYPES)) |
751 | |
752 | @@ -958,7 +958,7 @@ |
753 | self.transport.extra["client-accepted-types-hash"] = "lol" |
754 | self.exchanger.exchange() |
755 | self.exchanger.exchange() |
756 | - self.assertEquals( |
757 | + self.assertEqual( |
758 | self.transport.payloads[2]["client-accepted-types"], |
759 | sorted(["type-A"] + DEFAULT_ACCEPTED_TYPES)) |
760 | |
761 | @@ -970,28 +970,28 @@ |
762 | """ |
763 | self.exchanger.register_message("typefoo", lambda m: None) |
764 | types = self.exchanger.get_client_accepted_message_types() |
765 | - self.assertEquals(types, sorted(["typefoo"] + DEFAULT_ACCEPTED_TYPES)) |
766 | + self.assertEqual(types, sorted(["typefoo"] + DEFAULT_ACCEPTED_TYPES)) |
767 | |
768 | |
769 | class GetAcceptedTypesDiffTest(LandscapeTest): |
770 | |
771 | def test_diff_empty(self): |
772 | - self.assertEquals(get_accepted_types_diff([], []), |
773 | - "") |
774 | + self.assertEqual(get_accepted_types_diff([], []), |
775 | + "") |
776 | |
777 | def test_diff_add(self): |
778 | - self.assertEquals(get_accepted_types_diff([], ["wubble"]), |
779 | - "+wubble") |
780 | + self.assertEqual(get_accepted_types_diff([], ["wubble"]), |
781 | + "+wubble") |
782 | |
783 | def test_diff_remove(self): |
784 | - self.assertEquals(get_accepted_types_diff(["wubble"], []), |
785 | - "-wubble") |
786 | + self.assertEqual(get_accepted_types_diff(["wubble"], []), |
787 | + "-wubble") |
788 | |
789 | def test_diff_no_change(self): |
790 | - self.assertEquals(get_accepted_types_diff(["ooga"], ["ooga"]), |
791 | - "ooga") |
792 | + self.assertEqual(get_accepted_types_diff(["ooga"], ["ooga"]), |
793 | + "ooga") |
794 | |
795 | def test_diff_complex(self): |
796 | - self.assertEquals(get_accepted_types_diff(["foo", "bar"], |
797 | - ["foo", "ooga"]), |
798 | - "+ooga foo -bar") |
799 | + self.assertEqual(get_accepted_types_diff(["foo", "bar"], |
800 | + ["foo", "ooga"]), |
801 | + "+ooga foo -bar") |
802 | |
803 | === modified file 'landscape/broker/tests/test_exchangestore.py' |
804 | --- landscape/broker/tests/test_exchangestore.py 2010-06-08 16:48:25 +0000 |
805 | +++ landscape/broker/tests/test_exchangestore.py 2011-07-06 21:14:28 +0000 |
806 | @@ -31,11 +31,11 @@ |
807 | "SELECT operation_id, secure_id, message_type, timestamp " |
808 | "FROM message_context WHERE operation_id=?", (123,)) |
809 | results = cursor.fetchall() |
810 | - self.assertEquals(1, len(results)) |
811 | + self.assertEqual(1, len(results)) |
812 | [row] = results |
813 | - self.assertEquals(123, row[0]) |
814 | - self.assertEquals('abc', row[1]) |
815 | - self.assertEquals('change-packages', row[2]) |
816 | + self.assertEqual(123, row[0]) |
817 | + self.assertEqual('abc', row[1]) |
818 | + self.assertEqual('change-packages', row[2]) |
819 | self.assertTrue(row[3] > now) |
820 | |
821 | def test_add_message_context_with_duplicate_operation_id(self): |
822 | @@ -52,9 +52,9 @@ |
823 | now = time.time() |
824 | self.store1.add_message_context(234, 'bcd', 'change-packages') |
825 | context = self.store2.get_message_context(234) |
826 | - self.assertEquals(234, context.operation_id) |
827 | - self.assertEquals('bcd', context.secure_id) |
828 | - self.assertEquals('change-packages', context.message_type) |
829 | + self.assertEqual(234, context.operation_id) |
830 | + self.assertEqual('bcd', context.secure_id) |
831 | + self.assertEqual('change-packages', context.message_type) |
832 | self.assertTrue(context.timestamp > now) |
833 | |
834 | def test_get_message_context_with_nonexistent_operation_id(self): |
835 | @@ -74,11 +74,11 @@ |
836 | Calling C{all_operation_ids} on an empty database returns an empty |
837 | list. |
838 | """ |
839 | - self.assertEquals([], self.store1.all_operation_ids()) |
840 | + self.assertEqual([], self.store1.all_operation_ids()) |
841 | |
842 | def test_all_operation_ids(self): |
843 | """C{all_operation_ids} works correctly.""" |
844 | self.store1.add_message_context(456, 'cde', 'change-packages') |
845 | - self.assertEquals([456], self.store2.all_operation_ids()) |
846 | + self.assertEqual([456], self.store2.all_operation_ids()) |
847 | self.store2.add_message_context(567, 'def', 'change-packages') |
848 | - self.assertEquals([456, 567], self.store1.all_operation_ids()) |
849 | + self.assertEqual([456, 567], self.store1.all_operation_ids()) |
850 | |
851 | === modified file 'landscape/broker/tests/test_ping.py' |
852 | --- landscape/broker/tests/test_ping.py 2010-04-23 11:37:25 +0000 |
853 | +++ landscape/broker/tests/test_ping.py 2011-07-06 21:14:28 +0000 |
854 | @@ -60,7 +60,7 @@ |
855 | self.broker_service.identity, |
856 | get_page=client.get_page) |
857 | pinger.ping() |
858 | - self.assertEquals( |
859 | + self.assertEqual( |
860 | client.fetches, |
861 | [(url, True, {"Content-Type": "application/x-www-form-urlencoded"}, |
862 | "insecure_id=10")]) |
863 | @@ -77,7 +77,7 @@ |
864 | get_page=client.get_page) |
865 | d = pinger.ping() |
866 | d.addCallback(self.assertEqual, False) |
867 | - self.assertEquals(client.fetches, []) |
868 | + self.assertEqual(client.fetches, []) |
869 | |
870 | def test_respond(self): |
871 | """ |
872 | @@ -105,12 +105,13 @@ |
873 | get_page=client.failing_get_page) |
874 | d = pinger.ping() |
875 | failures = [] |
876 | + |
877 | def errback(failure): |
878 | failures.append(failure) |
879 | d.addErrback(errback) |
880 | - self.assertEquals(len(failures), 1) |
881 | - self.assertEquals(failures[0].getErrorMessage(), "That's a failure!") |
882 | - self.assertEquals(failures[0].type, AssertionError) |
883 | + self.assertEqual(len(failures), 1) |
884 | + self.assertEqual(failures[0].getErrorMessage(), "That's a failure!") |
885 | + self.assertEqual(failures[0].type, AssertionError) |
886 | |
887 | |
888 | class PingerTest(LandscapeTest): |
889 | @@ -126,6 +127,7 @@ |
890 | super(PingerTest, self).setUp() |
891 | self.url = "http://localhost:8081/whatever" |
892 | self.page_getter = FakePageGetter(None) |
893 | + |
894 | def factory(reactor, url, insecure_id): |
895 | return PingClient(reactor, url, insecure_id, |
896 | get_page=self.page_getter.get_page) |
897 | @@ -152,9 +154,9 @@ |
898 | self.pinger.start() |
899 | self.broker_service.identity.insecure_id = 23 |
900 | self.broker_service.reactor.advance(9) |
901 | - self.assertEquals(len(self.page_getter.fetches), 0) |
902 | + self.assertEqual(len(self.page_getter.fetches), 0) |
903 | self.broker_service.reactor.advance(1) |
904 | - self.assertEquals(len(self.page_getter.fetches), 1) |
905 | + self.assertEqual(len(self.page_getter.fetches), 1) |
906 | |
907 | def test_load_insecure_id(self): |
908 | """ |
909 | @@ -177,7 +179,7 @@ |
910 | # 70 = ping delay + urgent exchange delay |
911 | self.broker_service.reactor.advance(70) |
912 | |
913 | - self.assertEquals(len(self.broker_service.transport.payloads), 1) |
914 | + self.assertEqual(len(self.broker_service.transport.payloads), 1) |
915 | |
916 | def test_negative_response(self): |
917 | """ |
918 | @@ -187,7 +189,7 @@ |
919 | self.broker_service.identity.insecure_id = 42 |
920 | self.page_getter.response = {"messages": False} |
921 | self.broker_service.reactor.advance(10) |
922 | - self.assertEquals(len(self.broker_service.transport.payloads), 0) |
923 | + self.assertEqual(len(self.broker_service.transport.payloads), 0) |
924 | |
925 | def test_ping_error(self): |
926 | """ |
927 | @@ -200,8 +202,10 @@ |
928 | class BadPingClient(object): |
929 | def __init__(self, *args, **kwargs): |
930 | pass |
931 | + |
932 | def ping(self): |
933 | return fail(ZeroDivisionError("Couldn't fetch page")) |
934 | + |
935 | pinger = Pinger(self.broker_service.reactor, "http://foo.com/", |
936 | self.broker_service.identity, |
937 | self.broker_service.exchanger, |
938 | @@ -218,28 +222,28 @@ |
939 | self.assertTrue("Couldn't fetch page" in log) |
940 | |
941 | def test_get_interval(self): |
942 | - self.assertEquals(self.pinger.get_interval(), 10) |
943 | + self.assertEqual(self.pinger.get_interval(), 10) |
944 | |
945 | def test_set_intervals_handling(self): |
946 | self.pinger.start() |
947 | |
948 | self.broker_service.reactor.fire("message", |
949 | {"type": "set-intervals", "ping": 73}) |
950 | - self.assertEquals(self.pinger.get_interval(), 73) |
951 | + self.assertEqual(self.pinger.get_interval(), 73) |
952 | |
953 | # The server may set specific intervals only, not including the ping. |
954 | self.broker_service.reactor.fire("message", {"type": "set-intervals"}) |
955 | - self.assertEquals(self.pinger.get_interval(), 73) |
956 | + self.assertEqual(self.pinger.get_interval(), 73) |
957 | |
958 | self.broker_service.identity.insecure_id = 23 |
959 | self.broker_service.reactor.advance(72) |
960 | - self.assertEquals(len(self.page_getter.fetches), 0) |
961 | + self.assertEqual(len(self.page_getter.fetches), 0) |
962 | self.broker_service.reactor.advance(1) |
963 | - self.assertEquals(len(self.page_getter.fetches), 1) |
964 | + self.assertEqual(len(self.page_getter.fetches), 1) |
965 | |
966 | def test_get_url(self): |
967 | - self.assertEquals(self.pinger.get_url(), |
968 | - "http://localhost:8081/whatever") |
969 | + self.assertEqual(self.pinger.get_url(), |
970 | + "http://localhost:8081/whatever") |
971 | |
972 | def test_set_url(self): |
973 | url = "http://example.com/mysuperping" |
974 | @@ -247,7 +251,7 @@ |
975 | self.pinger.start() |
976 | self.broker_service.identity.insecure_id = 23 |
977 | self.broker_service.reactor.advance(10) |
978 | - self.assertEquals(self.page_getter.fetches[0][0], url) |
979 | + self.assertEqual(self.page_getter.fetches[0][0], url) |
980 | |
981 | def test_set_url_after_start(self): |
982 | url = "http://example.com/mysuperping" |
983 | @@ -255,4 +259,4 @@ |
984 | self.pinger.set_url(url) |
985 | self.broker_service.identity.insecure_id = 23 |
986 | self.broker_service.reactor.advance(10) |
987 | - self.assertEquals(self.page_getter.fetches[0][0], url) |
988 | + self.assertEqual(self.page_getter.fetches[0][0], url) |
989 | |
990 | === modified file 'landscape/broker/tests/test_server.py' |
991 | --- landscape/broker/tests/test_server.py 2010-05-07 10:35:25 +0000 |
992 | +++ landscape/broker/tests/test_server.py 2011-07-06 21:14:28 +0000 |
993 | @@ -68,14 +68,14 @@ |
994 | client components that need to communicate with the server. After |
995 | the registration they can be fetched with L{BrokerServer.get_clients}. |
996 | """ |
997 | - self.assertEquals(self.broker.get_clients(), []) |
998 | - self.assertEquals(self.broker.get_client("test"), None) |
999 | - self.assertEquals(self.broker.get_connectors(), []) |
1000 | - self.assertEquals(self.broker.get_connector("test"), None) |
1001 | + self.assertEqual(self.broker.get_clients(), []) |
1002 | + self.assertEqual(self.broker.get_client("test"), None) |
1003 | + self.assertEqual(self.broker.get_connectors(), []) |
1004 | + self.assertEqual(self.broker.get_connector("test"), None) |
1005 | |
1006 | def assert_registered(ignored): |
1007 | - self.assertEquals(len(self.broker.get_clients()), 1) |
1008 | - self.assertEquals(len(self.broker.get_connectors()), 1) |
1009 | + self.assertEqual(len(self.broker.get_clients()), 1) |
1010 | + self.assertEqual(len(self.broker.get_connectors()), 1) |
1011 | self.assertTrue( |
1012 | isinstance(self.broker.get_client("test"), FakeClient)) |
1013 | self.assertTrue( |
1014 | @@ -126,7 +126,7 @@ |
1015 | """ |
1016 | open(self.config_filename, "a").write("computer_title = New Title") |
1017 | result = self.broker.reload_configuration() |
1018 | - result.addCallback(lambda x: self.assertEquals( |
1019 | + result.addCallback(lambda x: self.assertEqual( |
1020 | self.config.computer_title, "New Title")) |
1021 | return result |
1022 | |
1023 | @@ -162,7 +162,7 @@ |
1024 | if no message types are accepted by the Landscape server. |
1025 | """ |
1026 | self.mstore.set_accepted_types([]) |
1027 | - self.assertEquals(self.broker.get_accepted_message_types(), []) |
1028 | + self.assertEqual(self.broker.get_accepted_message_types(), []) |
1029 | |
1030 | def test_get_accepted_message_types(self): |
1031 | """ |
1032 | @@ -170,15 +170,15 @@ |
1033 | message types accepted by the Landscape server. |
1034 | """ |
1035 | self.mstore.set_accepted_types(["foo", "bar"]) |
1036 | - self.assertEquals(sorted(self.broker.get_accepted_message_types()), |
1037 | - ["bar", "foo"]) |
1038 | + self.assertEqual(sorted(self.broker.get_accepted_message_types()), |
1039 | + ["bar", "foo"]) |
1040 | |
1041 | def test_get_server_uuid_with_unset_uuid(self): |
1042 | """ |
1043 | The L{BrokerServer.get_server_uuid} method returns C{None} if the uuid |
1044 | of the Landscape server we're pointing at is unknown. |
1045 | """ |
1046 | - self.assertEquals(self.broker.get_server_uuid(), None) |
1047 | + self.assertEqual(self.broker.get_server_uuid(), None) |
1048 | |
1049 | def test_get_server_uuid(self): |
1050 | """ |
1051 | @@ -186,7 +186,7 @@ |
1052 | Landscape server we're pointing at. |
1053 | """ |
1054 | self.mstore.set_server_uuid("the-uuid") |
1055 | - self.assertEquals(self.broker.get_server_uuid(), "the-uuid") |
1056 | + self.assertEqual(self.broker.get_server_uuid(), "the-uuid") |
1057 | |
1058 | def test_register_client_accepted_message_type(self): |
1059 | """ |
1060 | @@ -195,8 +195,8 @@ |
1061 | """ |
1062 | self.broker.register_client_accepted_message_type("type1") |
1063 | self.broker.register_client_accepted_message_type("type2") |
1064 | - self.assertEquals(self.exchanger.get_client_accepted_message_types(), |
1065 | - sorted(["type1", "type2"] + DEFAULT_ACCEPTED_TYPES)) |
1066 | + self.assertEqual(self.exchanger.get_client_accepted_message_types(), |
1067 | + sorted(["type1", "type2"] + DEFAULT_ACCEPTED_TYPES)) |
1068 | |
1069 | def test_fire_event(self): |
1070 | """ |
1071 | @@ -284,8 +284,8 @@ |
1072 | the given events. |
1073 | """ |
1074 | result = self.broker.listen_events(["event"]) |
1075 | - self.assertEquals(self.reactor.fire("event"), [None]) |
1076 | - self.assertEquals(self.reactor.fire("event"), []) |
1077 | + self.assertEqual(self.reactor.fire("event"), [None]) |
1078 | + self.assertEqual(self.reactor.fire("event"), []) |
1079 | return self.assertSuccess(result, "event") |
1080 | |
1081 | |
1082 | |
1083 | === modified file 'landscape/broker/tests/test_service.py' |
1084 | --- landscape/broker/tests/test_service.py 2010-08-11 11:56:29 +0000 |
1085 | +++ landscape/broker/tests/test_service.py 2011-07-06 21:14:28 +0000 |
1086 | @@ -22,7 +22,7 @@ |
1087 | """ |
1088 | A L{BrokerService} instance has a proper C{persist} attribute. |
1089 | """ |
1090 | - self.assertEquals( |
1091 | + self.assertEqual( |
1092 | self.service.persist.filename, |
1093 | os.path.join(self.config.data_path, "broker.bpickle")) |
1094 | |
1095 | @@ -31,38 +31,38 @@ |
1096 | A L{BrokerService} instance has a proper C{transport} attribute. |
1097 | """ |
1098 | self.assertTrue(isinstance(self.service.transport, HTTPTransport)) |
1099 | - self.assertEquals(self.service.transport.get_url(), self.config.url) |
1100 | + self.assertEqual(self.service.transport.get_url(), self.config.url) |
1101 | |
1102 | def test_message_store(self): |
1103 | """ |
1104 | A L{BrokerService} instance has a proper C{message_store} attribute. |
1105 | """ |
1106 | - self.assertEquals(self.service.message_store.get_accepted_types(), ()) |
1107 | + self.assertEqual(self.service.message_store.get_accepted_types(), ()) |
1108 | |
1109 | def test_identity(self): |
1110 | """ |
1111 | A L{BrokerService} instance has a proper C{identity} attribute. |
1112 | """ |
1113 | - self.assertEquals(self.service.identity.account_name, "some_account") |
1114 | + self.assertEqual(self.service.identity.account_name, "some_account") |
1115 | |
1116 | def test_exchanger(self): |
1117 | """ |
1118 | A L{BrokerService} instance has a proper C{exchanger} attribute. |
1119 | """ |
1120 | - self.assertEquals(self.service.exchanger.get_exchange_intervals(), |
1121 | - (60, 900)) |
1122 | + self.assertEqual(self.service.exchanger.get_exchange_intervals(), |
1123 | + (60, 900)) |
1124 | |
1125 | def test_pinger(self): |
1126 | """ |
1127 | A L{BrokerService} instance has a proper C{pinger} attribute. |
1128 | """ |
1129 | - self.assertEquals(self.service.pinger.get_url(), self.config.ping_url) |
1130 | + self.assertEqual(self.service.pinger.get_url(), self.config.ping_url) |
1131 | |
1132 | def test_registration(self): |
1133 | """ |
1134 | A L{BrokerService} instance has a proper C{registration} attribute. |
1135 | """ |
1136 | - self.assertEquals(self.service.registration.should_register(), False) |
1137 | + self.assertEqual(self.service.registration.should_register(), False) |
1138 | |
1139 | def test_wb_exit(self): |
1140 | """ |
1141 | |
1142 | === modified file 'landscape/broker/tests/test_store.py' |
1143 | --- landscape/broker/tests/test_store.py 2011-06-28 17:10:04 +0000 |
1144 | +++ landscape/broker/tests/test_store.py 2011-07-06 21:14:28 +0000 |
1145 | @@ -42,51 +42,51 @@ |
1146 | return self.time |
1147 | |
1148 | def test_get_set_sequence(self): |
1149 | - self.assertEquals(self.store.get_sequence(), 0) |
1150 | + self.assertEqual(self.store.get_sequence(), 0) |
1151 | self.store.set_sequence(3) |
1152 | - self.assertEquals(self.store.get_sequence(), 3) |
1153 | + self.assertEqual(self.store.get_sequence(), 3) |
1154 | |
1155 | # Ensure it's actually saved. |
1156 | self.store.commit() |
1157 | store = self.create_store() |
1158 | - self.assertEquals(store.get_sequence(), 3) |
1159 | + self.assertEqual(store.get_sequence(), 3) |
1160 | |
1161 | def test_get_set_server_sequence(self): |
1162 | - self.assertEquals(self.store.get_server_sequence(), 0) |
1163 | + self.assertEqual(self.store.get_server_sequence(), 0) |
1164 | self.store.set_server_sequence(3) |
1165 | - self.assertEquals(self.store.get_server_sequence(), 3) |
1166 | + self.assertEqual(self.store.get_server_sequence(), 3) |
1167 | |
1168 | # Ensure it's actually saved. |
1169 | self.store.commit() |
1170 | store = self.create_store() |
1171 | - self.assertEquals(store.get_server_sequence(), 3) |
1172 | + self.assertEqual(store.get_server_sequence(), 3) |
1173 | |
1174 | def test_get_set_server_uuid(self): |
1175 | - self.assertEquals(self.store.get_server_uuid(), None) |
1176 | + self.assertEqual(self.store.get_server_uuid(), None) |
1177 | self.store.set_server_uuid("abcd-efgh") |
1178 | - self.assertEquals(self.store.get_server_uuid(), "abcd-efgh") |
1179 | + self.assertEqual(self.store.get_server_uuid(), "abcd-efgh") |
1180 | |
1181 | # Ensure it's actually saved. |
1182 | self.store.commit() |
1183 | store = self.create_store() |
1184 | - self.assertEquals(store.get_server_uuid(), "abcd-efgh") |
1185 | + self.assertEqual(store.get_server_uuid(), "abcd-efgh") |
1186 | |
1187 | def test_get_pending_offset(self): |
1188 | - self.assertEquals(self.store.get_pending_offset(), 0) |
1189 | + self.assertEqual(self.store.get_pending_offset(), 0) |
1190 | self.store.set_pending_offset(3) |
1191 | - self.assertEquals(self.store.get_pending_offset(), 3) |
1192 | + self.assertEqual(self.store.get_pending_offset(), 3) |
1193 | |
1194 | def test_add_pending_offset(self): |
1195 | - self.assertEquals(self.store.get_pending_offset(), 0) |
1196 | - self.store.add_pending_offset(3) |
1197 | - self.assertEquals(self.store.get_pending_offset(), 3) |
1198 | - self.store.add_pending_offset(3) |
1199 | - self.assertEquals(self.store.get_pending_offset(), 6) |
1200 | + self.assertEqual(self.store.get_pending_offset(), 0) |
1201 | + self.store.add_pending_offset(3) |
1202 | + self.assertEqual(self.store.get_pending_offset(), 3) |
1203 | + self.store.add_pending_offset(3) |
1204 | + self.assertEqual(self.store.get_pending_offset(), 6) |
1205 | self.store.add_pending_offset(-3) |
1206 | - self.assertEquals(self.store.get_pending_offset(), 3) |
1207 | + self.assertEqual(self.store.get_pending_offset(), 3) |
1208 | |
1209 | def test_no_pending_messages(self): |
1210 | - self.assertEquals(self.store.get_pending_messages(1), []) |
1211 | + self.assertEqual(self.store.get_pending_messages(1), []) |
1212 | |
1213 | def test_delete_no_messages(self): |
1214 | self.store.delete_old_messages() |
1215 | @@ -102,8 +102,8 @@ |
1216 | self.store.set_accepted_types(["empty", "unaccepted"]) |
1217 | self.store.set_pending_offset(0) |
1218 | messages = self.store.get_pending_messages() |
1219 | - self.assertEquals(len(messages), 1) |
1220 | - self.assertEquals(messages[0]["type"], "unaccepted") |
1221 | + self.assertEqual(len(messages), 1) |
1222 | + self.assertEqual(messages[0]["type"], "unaccepted") |
1223 | |
1224 | def test_delete_all_messages(self): |
1225 | """Resetting the message store means removing *ALL* messages.""" |
1226 | @@ -115,8 +115,8 @@ |
1227 | self.store.set_pending_offset(2) |
1228 | self.store.delete_all_messages() |
1229 | self.store.set_accepted_types(["empty", "unaccepted"]) |
1230 | - self.assertEquals(self.store.get_pending_offset(), 0) |
1231 | - self.assertEquals(self.store.get_pending_messages(), []) |
1232 | + self.assertEqual(self.store.get_pending_offset(), 0) |
1233 | + self.assertEqual(self.store.get_pending_messages(), []) |
1234 | |
1235 | def test_one_message(self): |
1236 | self.store.add(dict(type="data", data="A thing")) |
1237 | @@ -130,38 +130,38 @@ |
1238 | for i in range(10): |
1239 | self.store.add(dict(type="data", data=str(i))) |
1240 | il = [m["data"] for m in self.store.get_pending_messages(5)] |
1241 | - self.assertEquals(il, map(str, [0, 1, 2, 3, 4])) |
1242 | + self.assertEqual(il, map(str, [0, 1, 2, 3, 4])) |
1243 | |
1244 | def test_offset(self): |
1245 | self.store.set_pending_offset(5) |
1246 | for i in range(15): |
1247 | self.store.add(dict(type="data", data=str(i))) |
1248 | il = [m["data"] for m in self.store.get_pending_messages(5)] |
1249 | - self.assertEquals(il, map(str, [5, 6, 7, 8, 9])) |
1250 | + self.assertEqual(il, map(str, [5, 6, 7, 8, 9])) |
1251 | |
1252 | def test_exercise_multi_dir(self): |
1253 | for i in range(35): |
1254 | self.store.add(dict(type="data", data=str(i))) |
1255 | il = [m["data"] for m in self.store.get_pending_messages(50)] |
1256 | - self.assertEquals(il, map(str, range(35))) |
1257 | + self.assertEqual(il, map(str, range(35))) |
1258 | |
1259 | def test_wb_clean_up_empty_directories(self): |
1260 | for i in range(60): |
1261 | self.store.add(dict(type="data", data=str(i))) |
1262 | il = [m["data"] for m in self.store.get_pending_messages(60)] |
1263 | - self.assertEquals(il, map(str, range(60))) |
1264 | - self.assertEquals(set(os.listdir(self.temp_dir)), set(["0", "1", "2"])) |
1265 | + self.assertEqual(il, map(str, range(60))) |
1266 | + self.assertEqual(set(os.listdir(self.temp_dir)), set(["0", "1", "2"])) |
1267 | |
1268 | self.store.set_pending_offset(60) |
1269 | self.store.delete_old_messages() |
1270 | - self.assertEquals(os.listdir(self.temp_dir), []) |
1271 | + self.assertEqual(os.listdir(self.temp_dir), []) |
1272 | |
1273 | def test_unaccepted(self): |
1274 | for i in range(10): |
1275 | self.store.add(dict(type=["data", "unaccepted"][i % 2], |
1276 | data=str(i))) |
1277 | il = [m["data"] for m in self.store.get_pending_messages(20)] |
1278 | - self.assertEquals(il, map(str, [0, 2, 4, 6, 8])) |
1279 | + self.assertEqual(il, map(str, [0, 2, 4, 6, 8])) |
1280 | |
1281 | def test_unaccepted_with_offset(self): |
1282 | for i in range(10): |
1283 | @@ -169,7 +169,7 @@ |
1284 | data=str(i))) |
1285 | self.store.set_pending_offset(2) |
1286 | il = [m["data"] for m in self.store.get_pending_messages(20)] |
1287 | - self.assertEquals(il, map(str, [4, 6, 8])) |
1288 | + self.assertEqual(il, map(str, [4, 6, 8])) |
1289 | |
1290 | def test_unaccepted_reaccepted(self): |
1291 | for i in range(10): |
1292 | @@ -179,7 +179,7 @@ |
1293 | il = [m["data"] for m in self.store.get_pending_messages(2)] |
1294 | self.store.set_accepted_types(["data", "unaccepted"]) |
1295 | il = [m["data"] for m in self.store.get_pending_messages(20)] |
1296 | - self.assertEquals(il, map(str, [4, 6, 8, 1, 3, 5, 7, 9])) |
1297 | + self.assertEqual(il, map(str, [4, 6, 8, 1, 3, 5, 7, 9])) |
1298 | |
1299 | def test_accepted_unaccepted(self): |
1300 | for i in range(10): |
1301 | @@ -191,10 +191,10 @@ |
1302 | self.store.set_pending_offset(2) |
1303 | self.store.set_accepted_types(["unaccepted"]) |
1304 | il = [m["data"] for m in self.store.get_pending_messages(20)] |
1305 | - self.assertEquals(il, map(str, [1, 3, 5, 7, 9])) |
1306 | + self.assertEqual(il, map(str, [1, 3, 5, 7, 9])) |
1307 | self.store.set_accepted_types(["data", "unaccepted"]) |
1308 | il = [m["data"] for m in self.store.get_pending_messages(20)] |
1309 | - self.assertEquals(il, map(str, [1, 3, 5, 7, 9, 4, 6, 8])) |
1310 | + self.assertEqual(il, map(str, [1, 3, 5, 7, 9, 4, 6, 8])) |
1311 | |
1312 | def test_accepted_unaccepted_old(self): |
1313 | for i in range(10): |
1314 | @@ -203,18 +203,18 @@ |
1315 | self.store.set_pending_offset(2) |
1316 | self.store.set_accepted_types(["unaccepted"]) |
1317 | il = [m["data"] for m in self.store.get_pending_messages(20)] |
1318 | - self.assertEquals(il, map(str, [1, 3, 5, 7, 9])) |
1319 | + self.assertEqual(il, map(str, [1, 3, 5, 7, 9])) |
1320 | # Now, if the server asks us to go back and process |
1321 | # previously accepted messages that are now unaccepted, |
1322 | # they should be put on hold. |
1323 | self.store.set_pending_offset(0) |
1324 | il = [m["data"] for m in self.store.get_pending_messages(20)] |
1325 | - self.assertEquals(il, map(str, [1, 3, 5, 7, 9])) |
1326 | + self.assertEqual(il, map(str, [1, 3, 5, 7, 9])) |
1327 | # When the server starts accepting them again, these old |
1328 | # messages will also be delivered. |
1329 | self.store.set_accepted_types(["data", "unaccepted"]) |
1330 | il = [m["data"] for m in self.store.get_pending_messages(20)] |
1331 | - self.assertEquals(il, map(str, [1, 3, 5, 7, 9, 0, 2, 4, 6, 8])) |
1332 | + self.assertEqual(il, map(str, [1, 3, 5, 7, 9, 0, 2, 4, 6, 8])) |
1333 | |
1334 | def test_wb_handle_broken_messages(self): |
1335 | self.log_helper.ignore_errors(ValueError) |
1336 | @@ -228,7 +228,7 @@ |
1337 | file.write("bpickle will break reading this") |
1338 | file.close() |
1339 | |
1340 | - self.assertEquals(self.store.get_pending_messages(), []) |
1341 | + self.assertEqual(self.store.get_pending_messages(), []) |
1342 | |
1343 | # FIXME This is an unfortunate assertion because it relies on |
1344 | # a message generated by external code. As it turns out, this |
1345 | @@ -265,14 +265,14 @@ |
1346 | |
1347 | messages = self.store.get_pending_messages() |
1348 | |
1349 | - self.assertEquals(messages, [{"type": "data", "data": "2", |
1350 | - "api": SERVER_API}]) |
1351 | + self.assertEqual(messages, [{"type": "data", "data": "2", |
1352 | + "api": SERVER_API}]) |
1353 | |
1354 | self.store.set_pending_offset(len(messages)) |
1355 | |
1356 | messages = self.store.get_pending_messages() |
1357 | self.store.delete_old_messages() |
1358 | - self.assertEquals(messages, []) |
1359 | + self.assertEqual(messages, []) |
1360 | self.assertTrue("ValueError" in self.logfile.getvalue()) |
1361 | |
1362 | def test_atomic_message_writing(self): |
1363 | @@ -296,30 +296,30 @@ |
1364 | self.assertRaises(IOError, self.store.add, {"type": "data", "data": 2}) |
1365 | self.mocker.verify() |
1366 | self.mocker.reset() |
1367 | - self.assertEquals(self.store.get_pending_messages(), |
1368 | + self.assertEqual(self.store.get_pending_messages(), |
1369 | [{"type": "data", "data": 1, "api": SERVER_API}]) |
1370 | |
1371 | def test_api_attribute(self): |
1372 | - self.assertEquals(self.store.api, SERVER_API) |
1373 | + self.assertEqual(self.store.api, SERVER_API) |
1374 | new_api = "New API version!" |
1375 | self.store.api = new_api |
1376 | - self.assertEquals(self.store.api, new_api) |
1377 | + self.assertEqual(self.store.api, new_api) |
1378 | |
1379 | def test_default_api_on_messages(self): |
1380 | self.store.add({"type": "empty"}) |
1381 | - self.assertEquals(self.store.get_pending_messages(), |
1382 | - [{"type": "empty", "api": SERVER_API}]) |
1383 | + self.assertEqual(self.store.get_pending_messages(), |
1384 | + [{"type": "empty", "api": SERVER_API}]) |
1385 | |
1386 | def test_custom_api_on_store(self): |
1387 | self.store.api = "X.Y" |
1388 | self.store.add({"type": "empty"}) |
1389 | - self.assertEquals(self.store.get_pending_messages(), |
1390 | - [{"type": "empty", "api": "X.Y"}]) |
1391 | + self.assertEqual(self.store.get_pending_messages(), |
1392 | + [{"type": "empty", "api": "X.Y"}]) |
1393 | |
1394 | def test_custom_api_on_messages(self): |
1395 | self.store.add({"type": "empty", "api": "X.Y"}) |
1396 | - self.assertEquals(self.store.get_pending_messages(), |
1397 | - [{"type": "empty", "api": "X.Y"}]) |
1398 | + self.assertEqual(self.store.get_pending_messages(), |
1399 | + [{"type": "empty", "api": "X.Y"}]) |
1400 | |
1401 | def test_coercion(self): |
1402 | """ |
1403 | @@ -347,17 +347,17 @@ |
1404 | self.store.add({"type": "data", |
1405 | "data": u"\N{HIRAGANA LETTER A}".encode("utf-8"), |
1406 | "api": "whatever"}) |
1407 | - self.assertEquals(self.store.get_pending_messages(), |
1408 | - [{"type": "data", "api": "whatever", |
1409 | - "data": u"\N{HIRAGANA LETTER A}"}]) |
1410 | + self.assertEqual(self.store.get_pending_messages(), |
1411 | + [{"type": "data", "api": "whatever", |
1412 | + "data": u"\N{HIRAGANA LETTER A}"}]) |
1413 | |
1414 | def test_count_pending_messages(self): |
1415 | """It is possible to get the total number of pending messages.""" |
1416 | - self.assertEquals(self.store.count_pending_messages(), 0) |
1417 | + self.assertEqual(self.store.count_pending_messages(), 0) |
1418 | self.store.add({"type": "empty"}) |
1419 | - self.assertEquals(self.store.count_pending_messages(), 1) |
1420 | + self.assertEqual(self.store.count_pending_messages(), 1) |
1421 | self.store.add({"type": "data", "data": "yay"}) |
1422 | - self.assertEquals(self.store.count_pending_messages(), 2) |
1423 | + self.assertEqual(self.store.count_pending_messages(), 2) |
1424 | |
1425 | def test_commit(self): |
1426 | """ |
1427 | @@ -373,8 +373,8 @@ |
1428 | self.assertTrue(os.path.exists(filename)) |
1429 | |
1430 | store = MessageStore(Persist(filename=filename), self.temp_dir) |
1431 | - self.assertEquals(set(store.get_accepted_types()), |
1432 | - set(["foo", "bar"])) |
1433 | + self.assertEqual(set(store.get_accepted_types()), |
1434 | + set(["foo", "bar"])) |
1435 | |
1436 | def test_is_pending_pre_and_post_message_delivery(self): |
1437 | self.log_helper.ignore_errors(ValueError) |
1438 | @@ -438,6 +438,6 @@ |
1439 | file.write("bpickle will break reading this") |
1440 | file.close() |
1441 | |
1442 | - self.assertEquals(self.store.get_pending_messages(), []) |
1443 | + self.assertEqual(self.store.get_pending_messages(), []) |
1444 | |
1445 | self.assertFalse(self.store.is_pending(id)) |
1446 | |
1447 | === modified file 'landscape/broker/tests/test_transport.py' |
1448 | --- landscape/broker/tests/test_transport.py 2011-06-29 17:50:48 +0000 |
1449 | +++ landscape/broker/tests/test_transport.py 2011-07-06 21:14:28 +0000 |
1450 | @@ -53,12 +53,12 @@ |
1451 | def test_get_url(self): |
1452 | url = "http://example/ooga" |
1453 | transport = HTTPTransport(url) |
1454 | - self.assertEquals(transport.get_url(), url) |
1455 | + self.assertEqual(transport.get_url(), url) |
1456 | |
1457 | def test_set_url(self): |
1458 | transport = HTTPTransport("http://example/ooga") |
1459 | transport.set_url("http://example/message-system") |
1460 | - self.assertEquals(transport.get_url(), "http://example/message-system") |
1461 | + self.assertEqual(transport.get_url(), "http://example/message-system") |
1462 | |
1463 | def test_request_data(self): |
1464 | """ |
1465 | @@ -76,13 +76,13 @@ |
1466 | message_api="X.Y") |
1467 | |
1468 | def got_result(ignored): |
1469 | - self.assertEquals(r.request.received_headers["x-computer-id"], |
1470 | - "34") |
1471 | - self.assertEquals(r.request.received_headers["user-agent"], |
1472 | - "landscape-client/%s" % (VERSION,)) |
1473 | - self.assertEquals(r.request.received_headers["x-message-api"], |
1474 | - "X.Y") |
1475 | - self.assertEquals(bpickle.loads(r.content), "HI") |
1476 | + self.assertEqual(r.request.received_headers["x-computer-id"], |
1477 | + "34") |
1478 | + self.assertEqual(r.request.received_headers["user-agent"], |
1479 | + "landscape-client/%s" % (VERSION,)) |
1480 | + self.assertEqual(r.request.received_headers["x-message-api"], |
1481 | + "X.Y") |
1482 | + self.assertEqual(bpickle.loads(r.content), "HI") |
1483 | result.addCallback(got_result) |
1484 | return result |
1485 | |
1486 | @@ -103,13 +103,13 @@ |
1487 | message_api="X.Y") |
1488 | |
1489 | def got_result(ignored): |
1490 | - self.assertEquals(r.request.received_headers["x-computer-id"], |
1491 | - "34") |
1492 | - self.assertEquals(r.request.received_headers["user-agent"], |
1493 | - "landscape-client/%s" % (VERSION,)) |
1494 | - self.assertEquals(r.request.received_headers["x-message-api"], |
1495 | - "X.Y") |
1496 | - self.assertEquals(bpickle.loads(r.content), "HI") |
1497 | + self.assertEqual(r.request.received_headers["x-computer-id"], |
1498 | + "34") |
1499 | + self.assertEqual(r.request.received_headers["user-agent"], |
1500 | + "landscape-client/%s" % (VERSION,)) |
1501 | + self.assertEqual(r.request.received_headers["x-message-api"], |
1502 | + "X.Y") |
1503 | + self.assertEqual(bpickle.loads(r.content), "HI") |
1504 | result.addCallback(got_result) |
1505 | return result |
1506 | |
1507 | @@ -134,8 +134,8 @@ |
1508 | message_api="X.Y") |
1509 | |
1510 | def got_result(ignored): |
1511 | - self.assertEquals(r.request, None) |
1512 | - self.assertEquals(r.content, None) |
1513 | + self.assertEqual(r.request, None) |
1514 | + self.assertEqual(r.content, None) |
1515 | self.assertTrue("server certificate verification failed" |
1516 | in self.logfile.getvalue()) |
1517 | result.addCallback(got_result) |
1518 | @@ -167,7 +167,7 @@ |
1519 | transport.exchange("pay load") |
1520 | |
1521 | file_path = os.path.join(path, static_filename()) |
1522 | - self.assertEquals("pay load", bpickle.loads(read_file(file_path))) |
1523 | + self.assertEqual("pay load", bpickle.loads(read_file(file_path))) |
1524 | |
1525 | def test_exchange_works_without_payload_recording(self): |
1526 | """ |
1527 | @@ -176,10 +176,11 @@ |
1528 | """ |
1529 | transport = HTTPTransport("http://localhost") |
1530 | self.called = False |
1531 | - |
1532 | + |
1533 | def fake_curl(param1, param2, param3): |
1534 | """Stub out the curl network call.""" |
1535 | self.called = True |
1536 | + |
1537 | class Curly(object): |
1538 | def getinfo(self, param1): |
1539 | return 200 |
1540 | @@ -190,6 +191,7 @@ |
1541 | |
1542 | self.assertTrue(self.called) |
1543 | |
1544 | + |
1545 | class PayloadRecorderTest(MockerTestCase): |
1546 | |
1547 | def test_get_payload_filename(self): |
1548 | @@ -207,7 +209,7 @@ |
1549 | |
1550 | payload_name = recorder.get_payload_filename() |
1551 | |
1552 | - self.assertEquals("12.346", payload_name) |
1553 | + self.assertEqual("12.346", payload_name) |
1554 | |
1555 | def test_get_payload_filename_no_duplicates(self): |
1556 | """ |
1557 | @@ -228,8 +230,8 @@ |
1558 | payload_name_1 = recorder.get_payload_filename() |
1559 | payload_name_2 = recorder.get_payload_filename() |
1560 | |
1561 | - self.assertEquals("12.345", payload_name_1) |
1562 | - self.assertEquals("12.346", payload_name_2) |
1563 | + self.assertEqual("12.345", payload_name_1) |
1564 | + self.assertEqual("12.346", payload_name_2) |
1565 | |
1566 | def test_save(self): |
1567 | """L{PayloadRecorder.save} should save the payload to the filesystem. |
1568 | @@ -242,7 +244,7 @@ |
1569 | recorder.get_payload_filename = static_filename |
1570 | recorder.save("payload data") |
1571 | file_path = os.path.join(path, static_filename()) |
1572 | - self.assertEquals("payload data", read_file(file_path)) |
1573 | + self.assertEqual("payload data", read_file(file_path)) |
1574 | |
1575 | def test_create_destination_dir(self): |
1576 | """ |
1577 | @@ -263,4 +265,4 @@ |
1578 | create_file(os.path.join(path, "one"), "one") |
1579 | create_file(os.path.join(path, "two"), "two") |
1580 | PayloadRecorder(path) |
1581 | - self.assertEquals([], os.listdir(path)) |
1582 | + self.assertEqual([], os.listdir(path)) |
1583 | |
1584 | === modified file 'landscape/lib/tests/test_amp.py' |
1585 | --- landscape/lib/tests/test_amp.py 2010-06-08 07:59:32 +0000 |
1586 | +++ landscape/lib/tests/test_amp.py 2011-07-06 21:14:28 +0000 |
1587 | @@ -2,10 +2,7 @@ |
1588 | from twisted.internet.defer import Deferred, DeferredList |
1589 | from twisted.internet.protocol import ClientCreator |
1590 | from twisted.internet.error import ConnectionDone, ConnectError |
1591 | -try: |
1592 | - from twisted.internet.task import Clock |
1593 | -except ImportError: |
1594 | - Clock = None # Dapper doesn't have it |
1595 | +from twisted.internet.task import Clock |
1596 | |
1597 | from landscape.lib.twisted_util import gather_results |
1598 | from landscape.lib.amp import ( |
1599 | @@ -456,7 +453,7 @@ |
1600 | The L{MethodCallClientFactory} class has a default value of 30 seconds |
1601 | for the maximum reconnection delay. |
1602 | """ |
1603 | - self.assertEquals(self.factory.maxDelay, 30) |
1604 | + self.assertEqual(self.factory.maxDelay, 30) |
1605 | |
1606 | def test_add_notifier(self): |
1607 | """ |
1608 | @@ -494,7 +491,7 @@ |
1609 | self.factory.retry = self.mocker.mock() |
1610 | self.factory.retry(KWARGS) |
1611 | self.mocker.replay() |
1612 | - self.assertEquals(self.factory.retries, 0) |
1613 | + self.assertEqual(self.factory.retries, 0) |
1614 | self.factory.clientConnectionFailed(None, None) |
1615 | |
1616 | def test_client_connection_failed_with_max_retries_reached(self): |
1617 | @@ -571,7 +568,7 @@ |
1618 | self.connector.disconnect() |
1619 | |
1620 | def assert_factor(ignored): |
1621 | - self.assertEquals(self.connector._factory.factor, 1.0) |
1622 | + self.assertEqual(self.connector._factory.factor, 1.0) |
1623 | |
1624 | result = self.connector.connect(factor=1.0) |
1625 | return result.addCallback(assert_factor) |
1626 | @@ -650,7 +647,7 @@ |
1627 | self.port = reactor.listenUNIX(self.socket, self.server_factory) |
1628 | |
1629 | def assert_failure(error): |
1630 | - self.assertEquals(str(error), "Forbidden method 'secret'") |
1631 | + self.assertEqual(str(error), "Forbidden method 'secret'") |
1632 | |
1633 | reactor.callLater(0.5, restart_listening) |
1634 | result = self.words.secret() |
1635 | @@ -686,7 +683,7 @@ |
1636 | self.port = reactor.listenUNIX(self.socket, self.server_factory) |
1637 | |
1638 | def assert_failure(error): |
1639 | - self.assertEquals(str(error), "Forbidden method 'secret'") |
1640 | + self.assertEqual(str(error), "Forbidden method 'secret'") |
1641 | |
1642 | # Use our own reconnect handler |
1643 | self.connector._factory.remove_notifier(self.words._handle_reconnect) |
1644 | @@ -710,13 +707,13 @@ |
1645 | self.port = reactor.listenUNIX(self.socket, self.server_factory) |
1646 | |
1647 | def assert_guess(response): |
1648 | - self.assertEquals(response, "Guessed!") |
1649 | + self.assertEqual(response, "Guessed!") |
1650 | |
1651 | def assert_secret(failure): |
1652 | - self.assertEquals(str(failure.value), "Forbidden method 'secret'") |
1653 | + self.assertEqual(str(failure.value), "Forbidden method 'secret'") |
1654 | |
1655 | def assert_motd(response): |
1656 | - self.assertEquals(response, "Words are cool") |
1657 | + self.assertEqual(response, "Words are cool") |
1658 | |
1659 | reactor.callLater(0.1, restart_listening) |
1660 | |
1661 | @@ -767,7 +764,7 @@ |
1662 | reactor.callLater(0.1, reconnected.callback, None) |
1663 | |
1664 | def assert_failure(error): |
1665 | - self.assertEquals(str(error), "timeout") |
1666 | + self.assertEqual(str(error), "timeout") |
1667 | return reconnected |
1668 | |
1669 | reactor.callLater(0.9, restart_listening) |
1670 | |
1671 | === modified file 'landscape/lib/tests/test_bootstrap.py' |
1672 | --- landscape/lib/tests/test_bootstrap.py 2008-06-10 10:56:01 +0000 |
1673 | +++ landscape/lib/tests/test_bootstrap.py 2011-07-06 21:14:28 +0000 |
1674 | @@ -117,7 +117,7 @@ |
1675 | filename = self.makeFile("CONTENT") |
1676 | file = self.bootstrap_class(filename) |
1677 | file.bootstrap() |
1678 | - self.assertEquals(open(filename).read(), "CONTENT") |
1679 | + self.assertEqual(open(filename).read(), "CONTENT") |
1680 | |
1681 | |
1682 | class BootstrapDirectoryTest(BootstrapCreationTest): |
1683 | |
1684 | === modified file 'landscape/lib/tests/test_bpickle.py' |
1685 | --- landscape/lib/tests/test_bpickle.py 2008-06-10 10:56:01 +0000 |
1686 | +++ landscape/lib/tests/test_bpickle.py 2011-07-06 21:14:28 +0000 |
1687 | @@ -6,7 +6,7 @@ |
1688 | class BPickleTest(unittest.TestCase): |
1689 | |
1690 | def test_int(self): |
1691 | - self.assertEquals(bpickle.loads(bpickle.dumps(1)), 1) |
1692 | + self.assertEqual(bpickle.loads(bpickle.dumps(1)), 1) |
1693 | |
1694 | def test_float(self): |
1695 | self.assertAlmostEquals(bpickle.loads(bpickle.dumps(2.3)), 2.3) |
1696 | @@ -17,35 +17,34 @@ |
1697 | self.assertAlmostEquals(bpickle.loads(bpickle.dumps(number)), number) |
1698 | |
1699 | def test_string(self): |
1700 | - self.assertEquals(bpickle.loads(bpickle.dumps('foo')), 'foo') |
1701 | + self.assertEqual(bpickle.loads(bpickle.dumps('foo')), 'foo') |
1702 | |
1703 | def test_list(self): |
1704 | - self.assertEquals(bpickle.loads(bpickle.dumps([1, 2, 'hello', 3.0])), |
1705 | - [1, 2, 'hello', 3.0]) |
1706 | + self.assertEqual(bpickle.loads(bpickle.dumps([1, 2, 'hello', 3.0])), |
1707 | + [1, 2, 'hello', 3.0]) |
1708 | |
1709 | def test_tuple(self): |
1710 | data = bpickle.dumps((1, [], 2, 'hello', 3.0)) |
1711 | - self.assertEquals(bpickle.loads(data), |
1712 | - (1, [], 2, 'hello', 3.0)) |
1713 | + self.assertEqual(bpickle.loads(data), |
1714 | + (1, [], 2, 'hello', 3.0)) |
1715 | |
1716 | def test_none(self): |
1717 | - self.assertEquals(bpickle.loads(bpickle.dumps(None)), None) |
1718 | + self.assertEqual(bpickle.loads(bpickle.dumps(None)), None) |
1719 | |
1720 | def test_unicode(self): |
1721 | - self.assertEquals(bpickle.loads(bpickle.dumps(u'\xc0')), u'\xc0') |
1722 | + self.assertEqual(bpickle.loads(bpickle.dumps(u'\xc0')), u'\xc0') |
1723 | |
1724 | def test_bool(self): |
1725 | - self.assertEquals(bpickle.loads(bpickle.dumps(True)), True) |
1726 | + self.assertEqual(bpickle.loads(bpickle.dumps(True)), True) |
1727 | |
1728 | def test_dict(self): |
1729 | dumped_tostr = bpickle.dumps({True: "hello"}) |
1730 | - self.assertEquals(bpickle.loads(dumped_tostr), |
1731 | - {True: "hello"}) |
1732 | + self.assertEqual(bpickle.loads(dumped_tostr), |
1733 | + {True: "hello"}) |
1734 | dumped_tobool = bpickle.dumps({True: False}) |
1735 | - self.assertEquals(bpickle.loads(dumped_tobool), |
1736 | - {True: False}) |
1737 | + self.assertEqual(bpickle.loads(dumped_tobool), |
1738 | + {True: False}) |
1739 | |
1740 | def test_long(self): |
1741 | long = 99999999999999999999999999999 |
1742 | - self.assertEquals(bpickle.loads(bpickle.dumps(long)), long) |
1743 | - |
1744 | + self.assertEqual(bpickle.loads(bpickle.dumps(long)), long) |
1745 | |
1746 | === modified file 'landscape/lib/tests/test_bpickle_dbus.py' |
1747 | --- landscape/lib/tests/test_bpickle_dbus.py 2008-06-10 10:56:01 +0000 |
1748 | +++ landscape/lib/tests/test_bpickle_dbus.py 2011-07-06 21:14:28 +0000 |
1749 | @@ -45,7 +45,7 @@ |
1750 | post = set(bpickle.dumps_table.iteritems()) |
1751 | self.assertTrue(pre.issubset(post)) |
1752 | self.assertTrue(object in bpickle.dumps_table) |
1753 | - self.assertTrue(len(original)+1, len(bpickle.dumps_table)) |
1754 | + self.assertTrue(len(original) + 1, len(bpickle.dumps_table)) |
1755 | |
1756 | def test_dumps_utf8string(self): |
1757 | """ |
1758 | @@ -56,9 +56,9 @@ |
1759 | from dbus.types import UTF8String |
1760 | |
1761 | value = UTF8String("") |
1762 | - self.assertEquals(dumps_utf8string(value), "u0:") |
1763 | + self.assertEqual(dumps_utf8string(value), "u0:") |
1764 | value = UTF8String("Charlie!") |
1765 | - self.assertEquals(dumps_utf8string(value), "u8:Charlie!") |
1766 | + self.assertEqual(dumps_utf8string(value), "u8:Charlie!") |
1767 | except ImportError: |
1768 | pass |
1769 | |
1770 | |
1771 | === modified file 'landscape/lib/tests/test_command.py' |
1772 | --- landscape/lib/tests/test_command.py 2009-03-18 10:13:12 +0000 |
1773 | +++ landscape/lib/tests/test_command.py 2011-07-06 21:14:28 +0000 |
1774 | @@ -9,24 +9,24 @@ |
1775 | super(CommandTest, self).setUp() |
1776 | |
1777 | def test_basic(self): |
1778 | - self.assertEquals(run_command("echo test"), "test") |
1779 | + self.assertEqual(run_command("echo test"), "test") |
1780 | |
1781 | def test_non_0_exit_status(self): |
1782 | try: |
1783 | run_command("false") |
1784 | except CommandError, error: |
1785 | - self.assertEquals(error.command, "false") |
1786 | - self.assertEquals(error.output, "") |
1787 | - self.assertEquals(error.exit_status, 1) |
1788 | + self.assertEqual(error.command, "false") |
1789 | + self.assertEqual(error.output, "") |
1790 | + self.assertEqual(error.exit_status, 1) |
1791 | else: |
1792 | self.fail("CommandError not raised") |
1793 | |
1794 | def test_error_str(self): |
1795 | - self.assertEquals(str(CommandError("test_command", 1, "test output")), |
1796 | - "'test_command' exited with status 1 " |
1797 | - "(test output)") |
1798 | + self.assertEqual(str(CommandError("test_command", 1, "test output")), |
1799 | + "'test_command' exited with status 1 " |
1800 | + "(test output)") |
1801 | |
1802 | def test_error_repr(self): |
1803 | - self.assertEquals(repr(CommandError("test_command", 1, "test output")), |
1804 | - "<CommandError command=<test_command> " |
1805 | - "exit_status=1 output=<test output>>") |
1806 | + self.assertEqual(repr(CommandError("test_command", 1, "test output")), |
1807 | + "<CommandError command=<test_command> " |
1808 | + "exit_status=1 output=<test output>>") |
1809 | |
1810 | === modified file 'landscape/lib/tests/test_disk.py' |
1811 | --- landscape/lib/tests/test_disk.py 2010-06-07 17:23:44 +0000 |
1812 | +++ landscape/lib/tests/test_disk.py 2011-07-06 21:14:28 +0000 |
1813 | @@ -43,23 +43,23 @@ |
1814 | def test_get_filesystem_for_path(self): |
1815 | self.set_mount_points(["/"]) |
1816 | info = get_filesystem_for_path("/", self.mount_file, self.statvfs) |
1817 | - self.assertEquals(info["mount-point"], "/") |
1818 | + self.assertEqual(info["mount-point"], "/") |
1819 | |
1820 | def test_get_filesystem_subpath(self): |
1821 | self.set_mount_points(["/"]) |
1822 | self.stat_results["/"] = (4096, 0, 1000, 500, 0, 0, 0, 0, 0) |
1823 | info = get_filesystem_for_path("/home", self.mount_file, self.statvfs) |
1824 | - self.assertEquals(info["mount-point"], "/") |
1825 | + self.assertEqual(info["mount-point"], "/") |
1826 | |
1827 | def test_get_filesystem_subpath_closest(self): |
1828 | self.set_mount_points(["/", "/home"]) |
1829 | info = get_filesystem_for_path("/home", self.mount_file, self.statvfs) |
1830 | - self.assertEquals(info["mount-point"], "/home") |
1831 | + self.assertEqual(info["mount-point"], "/home") |
1832 | |
1833 | def test_get_filesystem_subpath_not_stupid(self): |
1834 | self.set_mount_points(["/", "/ho"]) |
1835 | info = get_filesystem_for_path("/home", self.mount_file, self.statvfs) |
1836 | - self.assertEquals(info["mount-point"], "/") |
1837 | + self.assertEqual(info["mount-point"], "/") |
1838 | |
1839 | def test_symlink_home(self): |
1840 | symlink_path = self.makeFile() |
1841 | @@ -68,7 +68,7 @@ |
1842 | self.set_mount_points(["/", "/foo"]) |
1843 | info = get_filesystem_for_path(symlink_path, |
1844 | self.mount_file, self.statvfs) |
1845 | - self.assertEquals(info["mount-point"], "/foo") |
1846 | + self.assertEqual(info["mount-point"], "/foo") |
1847 | |
1848 | def test_whitelist(self): |
1849 | self.set_mount_points(["/"]) |
1850 | |
1851 | === modified file 'landscape/lib/tests/test_fd.py' |
1852 | --- landscape/lib/tests/test_fd.py 2009-04-01 16:05:35 +0000 |
1853 | +++ landscape/lib/tests/test_fd.py 2011-07-06 21:14:28 +0000 |
1854 | @@ -9,7 +9,7 @@ |
1855 | |
1856 | class CleanFDsTests(LandscapeTest): |
1857 | """Tests for L{clean_fds}.""" |
1858 | - |
1859 | + |
1860 | def mock_rlimit(self, limit): |
1861 | getrlimit_mock = self.mocker.replace("resource.getrlimit") |
1862 | getrlimit_mock(resource.RLIMIT_NOFILE) |
1863 | @@ -42,7 +42,7 @@ |
1864 | self.mocker.count(4093) |
1865 | self.mocker.replay() |
1866 | clean_fds() |
1867 | - self.assertEquals(closed_fds, range(3, 4096)) |
1868 | + self.assertEqual(closed_fds, range(3, 4096)) |
1869 | |
1870 | def test_ignore_OSErrors(self): |
1871 | """ |
1872 | @@ -53,6 +53,7 @@ |
1873 | self.mock_rlimit(10) |
1874 | |
1875 | closed_fds = [] |
1876 | + |
1877 | def remember_and_throw(fd): |
1878 | closed_fds.append(fd) |
1879 | raise OSError("Bad FD!") |
1880 | @@ -64,7 +65,7 @@ |
1881 | |
1882 | self.mocker.replay() |
1883 | clean_fds() |
1884 | - self.assertEquals(closed_fds, range(3, 10)) |
1885 | + self.assertEqual(closed_fds, range(3, 10)) |
1886 | |
1887 | def test_dont_ignore_other_errors(self): |
1888 | """ |
1889 | |
1890 | === modified file 'landscape/lib/tests/test_fetch.py' |
1891 | --- landscape/lib/tests/test_fetch.py 2011-01-20 19:25:15 +0000 |
1892 | +++ landscape/lib/tests/test_fetch.py 2011-07-06 21:14:28 +0000 |
1893 | @@ -84,113 +84,113 @@ |
1894 | def test_basic(self): |
1895 | curl = CurlStub("result") |
1896 | result = fetch("http://example.com", curl=curl) |
1897 | - self.assertEquals(result, "result") |
1898 | - self.assertEquals(curl.options, |
1899 | - {pycurl.URL: "http://example.com", |
1900 | - pycurl.FOLLOWLOCATION: True, |
1901 | - pycurl.MAXREDIRS: 5, |
1902 | - pycurl.CONNECTTIMEOUT: 30, |
1903 | - pycurl.LOW_SPEED_LIMIT: 1, |
1904 | - pycurl.LOW_SPEED_TIME: 600, |
1905 | - pycurl.NOSIGNAL: 1, |
1906 | - pycurl.WRITEFUNCTION: Any(), |
1907 | - pycurl.DNS_CACHE_TIMEOUT: 0, |
1908 | - pycurl.ENCODING: "gzip,deflate"}) |
1909 | + self.assertEqual(result, "result") |
1910 | + self.assertEqual(curl.options, |
1911 | + {pycurl.URL: "http://example.com", |
1912 | + pycurl.FOLLOWLOCATION: True, |
1913 | + pycurl.MAXREDIRS: 5, |
1914 | + pycurl.CONNECTTIMEOUT: 30, |
1915 | + pycurl.LOW_SPEED_LIMIT: 1, |
1916 | + pycurl.LOW_SPEED_TIME: 600, |
1917 | + pycurl.NOSIGNAL: 1, |
1918 | + pycurl.WRITEFUNCTION: Any(), |
1919 | + pycurl.DNS_CACHE_TIMEOUT: 0, |
1920 | + pycurl.ENCODING: "gzip,deflate"}) |
1921 | |
1922 | def test_post(self): |
1923 | curl = CurlStub("result") |
1924 | result = fetch("http://example.com", post=True, curl=curl) |
1925 | - self.assertEquals(result, "result") |
1926 | - self.assertEquals(curl.options, |
1927 | - {pycurl.URL: "http://example.com", |
1928 | - pycurl.FOLLOWLOCATION: True, |
1929 | - pycurl.MAXREDIRS: 5, |
1930 | - pycurl.CONNECTTIMEOUT: 30, |
1931 | - pycurl.LOW_SPEED_LIMIT: 1, |
1932 | - pycurl.LOW_SPEED_TIME: 600, |
1933 | - pycurl.NOSIGNAL: 1, |
1934 | - pycurl.WRITEFUNCTION: Any(), |
1935 | - pycurl.POST: True, |
1936 | - pycurl.DNS_CACHE_TIMEOUT: 0, |
1937 | - pycurl.ENCODING: "gzip,deflate"}) |
1938 | + self.assertEqual(result, "result") |
1939 | + self.assertEqual(curl.options, |
1940 | + {pycurl.URL: "http://example.com", |
1941 | + pycurl.FOLLOWLOCATION: True, |
1942 | + pycurl.MAXREDIRS: 5, |
1943 | + pycurl.CONNECTTIMEOUT: 30, |
1944 | + pycurl.LOW_SPEED_LIMIT: 1, |
1945 | + pycurl.LOW_SPEED_TIME: 600, |
1946 | + pycurl.NOSIGNAL: 1, |
1947 | + pycurl.WRITEFUNCTION: Any(), |
1948 | + pycurl.POST: True, |
1949 | + pycurl.DNS_CACHE_TIMEOUT: 0, |
1950 | + pycurl.ENCODING: "gzip,deflate"}) |
1951 | |
1952 | def test_post_data(self): |
1953 | curl = CurlStub("result") |
1954 | result = fetch("http://example.com", post=True, data="data", curl=curl) |
1955 | - self.assertEquals(result, "result") |
1956 | - self.assertEquals(curl.options[pycurl.READFUNCTION](), "data") |
1957 | - self.assertEquals(curl.options, |
1958 | - {pycurl.URL: "http://example.com", |
1959 | - pycurl.FOLLOWLOCATION: True, |
1960 | - pycurl.MAXREDIRS: 5, |
1961 | - pycurl.CONNECTTIMEOUT: 30, |
1962 | - pycurl.LOW_SPEED_LIMIT: 1, |
1963 | - pycurl.LOW_SPEED_TIME: 600, |
1964 | - pycurl.NOSIGNAL: 1, |
1965 | - pycurl.WRITEFUNCTION: Any(), |
1966 | - pycurl.POST: True, |
1967 | - pycurl.POSTFIELDSIZE: 4, |
1968 | - pycurl.READFUNCTION: Any(), |
1969 | - pycurl.DNS_CACHE_TIMEOUT: 0, |
1970 | - pycurl.ENCODING: "gzip,deflate"}) |
1971 | + self.assertEqual(result, "result") |
1972 | + self.assertEqual(curl.options[pycurl.READFUNCTION](), "data") |
1973 | + self.assertEqual(curl.options, |
1974 | + {pycurl.URL: "http://example.com", |
1975 | + pycurl.FOLLOWLOCATION: True, |
1976 | + pycurl.MAXREDIRS: 5, |
1977 | + pycurl.CONNECTTIMEOUT: 30, |
1978 | + pycurl.LOW_SPEED_LIMIT: 1, |
1979 | + pycurl.LOW_SPEED_TIME: 600, |
1980 | + pycurl.NOSIGNAL: 1, |
1981 | + pycurl.WRITEFUNCTION: Any(), |
1982 | + pycurl.POST: True, |
1983 | + pycurl.POSTFIELDSIZE: 4, |
1984 | + pycurl.READFUNCTION: Any(), |
1985 | + pycurl.DNS_CACHE_TIMEOUT: 0, |
1986 | + pycurl.ENCODING: "gzip,deflate"}) |
1987 | |
1988 | def test_cainfo(self): |
1989 | curl = CurlStub("result") |
1990 | result = fetch("https://example.com", cainfo="cainfo", curl=curl) |
1991 | - self.assertEquals(result, "result") |
1992 | - self.assertEquals(curl.options, |
1993 | - {pycurl.URL: "https://example.com", |
1994 | - pycurl.FOLLOWLOCATION: True, |
1995 | - pycurl.MAXREDIRS: 5, |
1996 | - pycurl.CONNECTTIMEOUT: 30, |
1997 | - pycurl.LOW_SPEED_LIMIT: 1, |
1998 | - pycurl.LOW_SPEED_TIME: 600, |
1999 | - pycurl.NOSIGNAL: 1, |
2000 | - pycurl.WRITEFUNCTION: Any(), |
2001 | - pycurl.CAINFO: "cainfo", |
2002 | - pycurl.DNS_CACHE_TIMEOUT: 0, |
2003 | - pycurl.ENCODING: "gzip,deflate"}) |
2004 | + self.assertEqual(result, "result") |
2005 | + self.assertEqual(curl.options, |
2006 | + {pycurl.URL: "https://example.com", |
2007 | + pycurl.FOLLOWLOCATION: True, |
2008 | + pycurl.MAXREDIRS: 5, |
2009 | + pycurl.CONNECTTIMEOUT: 30, |
2010 | + pycurl.LOW_SPEED_LIMIT: 1, |
2011 | + pycurl.LOW_SPEED_TIME: 600, |
2012 | + pycurl.NOSIGNAL: 1, |
2013 | + pycurl.WRITEFUNCTION: Any(), |
2014 | + pycurl.CAINFO: "cainfo", |
2015 | + pycurl.DNS_CACHE_TIMEOUT: 0, |
2016 | + pycurl.ENCODING: "gzip,deflate"}) |
2017 | |
2018 | def test_cainfo_on_http(self): |
2019 | curl = CurlStub("result") |
2020 | result = fetch("http://example.com", cainfo="cainfo", curl=curl) |
2021 | - self.assertEquals(result, "result") |
2022 | + self.assertEqual(result, "result") |
2023 | self.assertTrue(pycurl.CAINFO not in curl.options) |
2024 | |
2025 | def test_headers(self): |
2026 | curl = CurlStub("result") |
2027 | result = fetch("http://example.com", |
2028 | headers={"a": "1", "b": "2"}, curl=curl) |
2029 | - self.assertEquals(result, "result") |
2030 | - self.assertEquals(curl.options, |
2031 | - {pycurl.URL: "http://example.com", |
2032 | - pycurl.FOLLOWLOCATION: True, |
2033 | - pycurl.MAXREDIRS: 5, |
2034 | - pycurl.CONNECTTIMEOUT: 30, |
2035 | - pycurl.LOW_SPEED_LIMIT: 1, |
2036 | - pycurl.LOW_SPEED_TIME: 600, |
2037 | - pycurl.NOSIGNAL: 1, |
2038 | - pycurl.WRITEFUNCTION: Any(), |
2039 | - pycurl.HTTPHEADER: ["a: 1", "b: 2"], |
2040 | - pycurl.DNS_CACHE_TIMEOUT: 0, |
2041 | - pycurl.ENCODING: "gzip,deflate"}) |
2042 | + self.assertEqual(result, "result") |
2043 | + self.assertEqual(curl.options, |
2044 | + {pycurl.URL: "http://example.com", |
2045 | + pycurl.FOLLOWLOCATION: True, |
2046 | + pycurl.MAXREDIRS: 5, |
2047 | + pycurl.CONNECTTIMEOUT: 30, |
2048 | + pycurl.LOW_SPEED_LIMIT: 1, |
2049 | + pycurl.LOW_SPEED_TIME: 600, |
2050 | + pycurl.NOSIGNAL: 1, |
2051 | + pycurl.WRITEFUNCTION: Any(), |
2052 | + pycurl.HTTPHEADER: ["a: 1", "b: 2"], |
2053 | + pycurl.DNS_CACHE_TIMEOUT: 0, |
2054 | + pycurl.ENCODING: "gzip,deflate"}) |
2055 | |
2056 | def test_timeouts(self): |
2057 | curl = CurlStub("result") |
2058 | result = fetch("http://example.com", connect_timeout=5, |
2059 | total_timeout=30, curl=curl) |
2060 | - self.assertEquals(result, "result") |
2061 | - self.assertEquals(curl.options, |
2062 | - {pycurl.URL: "http://example.com", |
2063 | - pycurl.FOLLOWLOCATION: True, |
2064 | - pycurl.MAXREDIRS: 5, |
2065 | - pycurl.CONNECTTIMEOUT: 5, |
2066 | - pycurl.LOW_SPEED_LIMIT: 1, |
2067 | - pycurl.LOW_SPEED_TIME: 30, |
2068 | - pycurl.NOSIGNAL: 1, |
2069 | - pycurl.WRITEFUNCTION: Any(), |
2070 | - pycurl.DNS_CACHE_TIMEOUT: 0, |
2071 | - pycurl.ENCODING: "gzip,deflate"}) |
2072 | + self.assertEqual(result, "result") |
2073 | + self.assertEqual(curl.options, |
2074 | + {pycurl.URL: "http://example.com", |
2075 | + pycurl.FOLLOWLOCATION: True, |
2076 | + pycurl.MAXREDIRS: 5, |
2077 | + pycurl.CONNECTTIMEOUT: 5, |
2078 | + pycurl.LOW_SPEED_LIMIT: 1, |
2079 | + pycurl.LOW_SPEED_TIME: 30, |
2080 | + pycurl.NOSIGNAL: 1, |
2081 | + pycurl.WRITEFUNCTION: Any(), |
2082 | + pycurl.DNS_CACHE_TIMEOUT: 0, |
2083 | + pycurl.ENCODING: "gzip,deflate"}) |
2084 | |
2085 | def test_unicode(self): |
2086 | """ |
2087 | @@ -199,8 +199,8 @@ |
2088 | """ |
2089 | curl = CurlStub("result") |
2090 | result = fetch(u"http://example.com", curl=curl) |
2091 | - self.assertEquals(result, "result") |
2092 | - self.assertEquals(curl.options[pycurl.URL], "http://example.com") |
2093 | + self.assertEqual(result, "result") |
2094 | + self.assertEqual(curl.options[pycurl.URL], "http://example.com") |
2095 | self.assertTrue(isinstance(curl.options[pycurl.URL], str)) |
2096 | |
2097 | def test_non_200_result(self): |
2098 | @@ -208,36 +208,36 @@ |
2099 | try: |
2100 | fetch("http://example.com", curl=curl) |
2101 | except HTTPCodeError, error: |
2102 | - self.assertEquals(error.http_code, 404) |
2103 | - self.assertEquals(error.body, "result") |
2104 | + self.assertEqual(error.http_code, 404) |
2105 | + self.assertEqual(error.body, "result") |
2106 | else: |
2107 | self.fail("HTTPCodeError not raised") |
2108 | |
2109 | def test_http_error_str(self): |
2110 | - self.assertEquals(str(HTTPCodeError(501, "")), |
2111 | - "Server returned HTTP code 501") |
2112 | + self.assertEqual(str(HTTPCodeError(501, "")), |
2113 | + "Server returned HTTP code 501") |
2114 | |
2115 | def test_http_error_repr(self): |
2116 | - self.assertEquals(repr(HTTPCodeError(501, "")), |
2117 | - "<HTTPCodeError http_code=501>") |
2118 | + self.assertEqual(repr(HTTPCodeError(501, "")), |
2119 | + "<HTTPCodeError http_code=501>") |
2120 | |
2121 | def test_pycurl_error(self): |
2122 | curl = CurlStub(error=pycurl.error(60, "pycurl error")) |
2123 | try: |
2124 | fetch("http://example.com", curl=curl) |
2125 | except PyCurlError, error: |
2126 | - self.assertEquals(error.error_code, 60) |
2127 | - self.assertEquals(error.message, "pycurl error") |
2128 | + self.assertEqual(error.error_code, 60) |
2129 | + self.assertEqual(error.message, "pycurl error") |
2130 | else: |
2131 | self.fail("PyCurlError not raised") |
2132 | |
2133 | def test_pycurl_error_str(self): |
2134 | - self.assertEquals(str(PyCurlError(60, "pycurl error")), |
2135 | - "Error 60: pycurl error") |
2136 | + self.assertEqual(str(PyCurlError(60, "pycurl error")), |
2137 | + "Error 60: pycurl error") |
2138 | |
2139 | def test_pycurl_error_repr(self): |
2140 | - self.assertEquals(repr(PyCurlError(60, "pycurl error")), |
2141 | - "<PyCurlError args=(60, 'pycurl error')>") |
2142 | + self.assertEqual(repr(PyCurlError(60, "pycurl error")), |
2143 | + "<PyCurlError args=(60, 'pycurl error')>") |
2144 | |
2145 | def test_create_curl(self): |
2146 | curls = [] |
2147 | @@ -251,34 +251,36 @@ |
2148 | pycurl.Curl = pycurl_Curl |
2149 | result = fetch("http://example.com") |
2150 | curl = curls[0] |
2151 | - self.assertEquals(result, "result") |
2152 | - self.assertEquals(curl.options, |
2153 | - {pycurl.URL: "http://example.com", |
2154 | - pycurl.FOLLOWLOCATION: True, |
2155 | - pycurl.MAXREDIRS: 5, |
2156 | - pycurl.CONNECTTIMEOUT: 30, |
2157 | - pycurl.LOW_SPEED_LIMIT: 1, |
2158 | - pycurl.LOW_SPEED_TIME: 600, |
2159 | - pycurl.NOSIGNAL: 1, |
2160 | - pycurl.WRITEFUNCTION: Any(), |
2161 | - pycurl.DNS_CACHE_TIMEOUT: 0, |
2162 | - pycurl.ENCODING: "gzip,deflate"}) |
2163 | + self.assertEqual(result, "result") |
2164 | + self.assertEqual(curl.options, |
2165 | + {pycurl.URL: "http://example.com", |
2166 | + pycurl.FOLLOWLOCATION: True, |
2167 | + pycurl.MAXREDIRS: 5, |
2168 | + pycurl.CONNECTTIMEOUT: 30, |
2169 | + pycurl.LOW_SPEED_LIMIT: 1, |
2170 | + pycurl.LOW_SPEED_TIME: 600, |
2171 | + pycurl.NOSIGNAL: 1, |
2172 | + pycurl.WRITEFUNCTION: Any(), |
2173 | + pycurl.DNS_CACHE_TIMEOUT: 0, |
2174 | + pycurl.ENCODING: "gzip,deflate"}) |
2175 | finally: |
2176 | pycurl.Curl = Curl |
2177 | |
2178 | def test_async_fetch(self): |
2179 | curl = CurlStub("result") |
2180 | d = fetch_async("http://example.com/", curl=curl) |
2181 | + |
2182 | def got_result(result): |
2183 | - self.assertEquals(result, "result") |
2184 | + self.assertEqual(result, "result") |
2185 | return d.addCallback(got_result) |
2186 | |
2187 | def test_async_fetch_with_error(self): |
2188 | curl = CurlStub("result", {pycurl.HTTP_CODE: 501}) |
2189 | d = fetch_async("http://example.com/", curl=curl) |
2190 | + |
2191 | def got_error(failure): |
2192 | - self.assertEquals(failure.value.http_code, 501) |
2193 | - self.assertEquals(failure.value.body, "result") |
2194 | + self.assertEqual(failure.value.http_code, 501) |
2195 | + self.assertEqual(failure.value.body, "result") |
2196 | return failure |
2197 | d.addErrback(got_error) |
2198 | self.assertFailure(d, HTTPCodeError) |
2199 | @@ -306,7 +308,7 @@ |
2200 | errback=errback, curl=curl) |
2201 | |
2202 | def completed(result): |
2203 | - self.assertEquals(url_results, {}) |
2204 | + self.assertEqual(url_results, {}) |
2205 | |
2206 | return d.addCallback(completed) |
2207 | |
2208 | @@ -321,8 +323,8 @@ |
2209 | |
2210 | def errback(failure, url): |
2211 | failed_urls.append(url) |
2212 | - self.assertEquals(failure.value.body, "wrong") |
2213 | - self.assertEquals(failure.value.http_code, 501) |
2214 | + self.assertEqual(failure.value.body, "wrong") |
2215 | + self.assertEqual(failure.value.http_code, 501) |
2216 | return failure |
2217 | |
2218 | curl = CurlManyStub(url_results) |
2219 | @@ -332,7 +334,7 @@ |
2220 | def check_failure(failure): |
2221 | self.assertTrue(isinstance(failure.subFailure.value, |
2222 | HTTPCodeError)) |
2223 | - self.assertEquals(failed_urls, ["http://wrong/"]) |
2224 | + self.assertEqual(failed_urls, ["http://wrong/"]) |
2225 | |
2226 | self.assertFailure(result, FirstError) |
2227 | return result.addCallback(check_failure) |
2228 | @@ -342,10 +344,10 @@ |
2229 | L{url_to_filename} extracts the filename part of an URL, optionally |
2230 | prepending a directory path to it. |
2231 | """ |
2232 | - self.assertEquals(url_to_filename("http://some/file"), "file") |
2233 | - self.assertEquals(url_to_filename("http://some/file/"), "file") |
2234 | - self.assertEquals(url_to_filename("http://some/file", directory="dir"), |
2235 | - os.path.join("dir", "file")) |
2236 | + self.assertEqual(url_to_filename("http://some/file"), "file") |
2237 | + self.assertEqual(url_to_filename("http://some/file/"), "file") |
2238 | + self.assertEqual(url_to_filename("http://some/file", directory="dir"), |
2239 | + os.path.join("dir", "file")) |
2240 | |
2241 | def test_fetch_to_files(self): |
2242 | """ |
2243 | @@ -362,7 +364,7 @@ |
2244 | def check_files(ignored): |
2245 | for result in url_results.itervalues(): |
2246 | fd = open(os.path.join(directory, result)) |
2247 | - self.assertEquals(fd.read(), result) |
2248 | + self.assertEqual(fd.read(), result) |
2249 | fd.close() |
2250 | |
2251 | result.addCallback(check_files) |
2252 | @@ -401,14 +403,14 @@ |
2253 | curl=curl) |
2254 | |
2255 | def check_messages(failure): |
2256 | - self.assertEquals(len(messages), 1) |
2257 | - self.assertEquals(messages[0], |
2258 | - "Couldn't fetch file from http://im/wrong " |
2259 | - "(Server returned HTTP code 404)") |
2260 | + self.assertEqual(len(messages), 1) |
2261 | + self.assertEqual(messages[0], |
2262 | + "Couldn't fetch file from http://im/wrong " |
2263 | + "(Server returned HTTP code 404)") |
2264 | messages.pop() |
2265 | |
2266 | def check_files(ignored): |
2267 | - self.assertEquals(messages, []) |
2268 | + self.assertEqual(messages, []) |
2269 | self.assertFalse(os.path.exists(os.path.join(directory, "wrong"))) |
2270 | |
2271 | result.addErrback(check_messages) |
2272 | @@ -428,7 +430,7 @@ |
2273 | |
2274 | def check_error(failure): |
2275 | error = str(failure.value.subFailure.value) |
2276 | - self.assertEquals(error, "[Errno 2] No such file or directory: " |
2277 | + self.assertEqual(error, "[Errno 2] No such file or directory: " |
2278 | "'i/dont/exist/right'") |
2279 | self.assertFalse(os.path.exists(os.path.join(directory, "right"))) |
2280 | |
2281 | |
2282 | === modified file 'landscape/lib/tests/test_fs.py' |
2283 | --- landscape/lib/tests/test_fs.py 2010-04-01 08:28:22 +0000 |
2284 | +++ landscape/lib/tests/test_fs.py 2011-07-06 21:14:28 +0000 |
2285 | @@ -10,7 +10,7 @@ |
2286 | With no options L{read_file} reads the whole file passed as argument. |
2287 | """ |
2288 | path = self.makeFile("foo") |
2289 | - self.assertEquals(read_file(path), "foo") |
2290 | + self.assertEqual(read_file(path), "foo") |
2291 | |
2292 | def test_read_file_with_limit(self): |
2293 | """ |
2294 | @@ -18,14 +18,14 @@ |
2295 | given limit. |
2296 | """ |
2297 | path = self.makeFile("foo bar") |
2298 | - self.assertEquals(read_file(path, limit=3), " bar") |
2299 | + self.assertEqual(read_file(path, limit=3), " bar") |
2300 | |
2301 | def test_read_file_with_negative_limit(self): |
2302 | """ |
2303 | With a negative limit L{read_file} reads only the tail of the file. |
2304 | """ |
2305 | path = self.makeFile("foo bar from end") |
2306 | - self.assertEquals(read_file(path, limit=-3), "end") |
2307 | + self.assertEqual(read_file(path, limit=-3), "end") |
2308 | |
2309 | def test_read_file_with_limit_bigger_than_file(self): |
2310 | """ |
2311 | @@ -33,8 +33,8 @@ |
2312 | file. |
2313 | """ |
2314 | path = self.makeFile("foo bar from end") |
2315 | - self.assertEquals(read_file(path, limit=100), "foo bar from end") |
2316 | - self.assertEquals(read_file(path, limit=-100), "foo bar from end") |
2317 | + self.assertEqual(read_file(path, limit=100), "foo bar from end") |
2318 | + self.assertEqual(read_file(path, limit=-100), "foo bar from end") |
2319 | |
2320 | |
2321 | class TouchFileTest(LandscapeTest): |
2322 | |
2323 | === modified file 'landscape/lib/tests/test_gpg.py' |
2324 | --- landscape/lib/tests/test_gpg.py 2009-10-27 09:33:45 +0000 |
2325 | +++ landscape/lib/tests/test_gpg.py 2011-07-06 21:14:28 +0000 |
2326 | @@ -32,7 +32,8 @@ |
2327 | result = gpg_verify("/some/file", "/some/signature", gpg=gpg) |
2328 | |
2329 | def check_result(ignored): |
2330 | - self.assertEquals(open(gpg_options).read(), |
2331 | + self.assertEqual( |
2332 | + open(gpg_options).read(), |
2333 | "--no-options --homedir %s --no-default-keyring " |
2334 | "--ignore-time-conflict --keyring /etc/apt/trusted.gpg " |
2335 | "--verify /some/signature /some/file" % gpg_home) |
2336 | @@ -64,9 +65,9 @@ |
2337 | result = gpg_verify("/some/file", "/some/signature", gpg=gpg) |
2338 | |
2339 | def check_failure(failure): |
2340 | - self.assertEquals(str(failure.value), |
2341 | - "%s failed (out='out\n', err='err\n', " |
2342 | - "code='1')" % gpg) |
2343 | + self.assertEqual(str(failure.value), |
2344 | + "%s failed (out='out\n', err='err\n', " |
2345 | + "code='1')" % gpg) |
2346 | self.assertFalse(os.path.exists(gpg_home)) |
2347 | |
2348 | result.addCallback(self.fail) |
2349 | |
2350 | === modified file 'landscape/lib/tests/test_lsb_release.py' |
2351 | --- landscape/lib/tests/test_lsb_release.py 2009-10-09 10:01:02 +0000 |
2352 | +++ landscape/lib/tests/test_lsb_release.py 2011-07-06 21:14:28 +0000 |
2353 | @@ -16,11 +16,11 @@ |
2354 | "DISTRIB_DESCRIPTION=" |
2355 | "\"Ubuntu 6.06.1 LTS\"\n") |
2356 | |
2357 | - self.assertEquals(parse_lsb_release(lsb_release_filename), |
2358 | - {"distributor-id": "Ubuntu", |
2359 | - "description": "Ubuntu 6.06.1 LTS", |
2360 | - "release": "6.06", |
2361 | - "code-name": "dapper"}) |
2362 | + self.assertEqual(parse_lsb_release(lsb_release_filename), |
2363 | + {"distributor-id": "Ubuntu", |
2364 | + "description": "Ubuntu 6.06.1 LTS", |
2365 | + "release": "6.06", |
2366 | + "code-name": "dapper"}) |
2367 | |
2368 | def test_parse_lsb_release_with_missing_or_extra_fields(self): |
2369 | """ |
2370 | @@ -29,5 +29,5 @@ |
2371 | """ |
2372 | lsb_release_filename = self.makeFile("DISTRIB_ID=Ubuntu\n" |
2373 | "FOO=Bar\n") |
2374 | - self.assertEquals(parse_lsb_release(lsb_release_filename), |
2375 | - {"distributor-id": "Ubuntu"}) |
2376 | + self.assertEqual(parse_lsb_release(lsb_release_filename), |
2377 | + {"distributor-id": "Ubuntu"}) |
2378 | |
2379 | === modified file 'landscape/lib/tests/test_monitor.py' |
2380 | --- landscape/lib/tests/test_monitor.py 2008-06-10 10:56:01 +0000 |
2381 | +++ landscape/lib/tests/test_monitor.py 2011-07-06 21:14:28 +0000 |
2382 | @@ -17,24 +17,24 @@ |
2383 | self.timer = Timer(create_time=self.reactor.time) |
2384 | |
2385 | def test_since_start(self): |
2386 | - self.assertEquals(self.timer.since_start(), 0.0) |
2387 | + self.assertEqual(self.timer.since_start(), 0.0) |
2388 | |
2389 | self.reactor.advance(1) |
2390 | - self.assertEquals(self.timer.since_start(), 1.0) |
2391 | + self.assertEqual(self.timer.since_start(), 1.0) |
2392 | |
2393 | self.reactor.advance(2) |
2394 | - self.assertEquals(self.timer.since_start(), 3.0) |
2395 | + self.assertEqual(self.timer.since_start(), 3.0) |
2396 | |
2397 | def test_since_reset(self): |
2398 | self.reactor.advance(1) |
2399 | - self.assertEquals(self.timer.since_reset(), 1.0) |
2400 | + self.assertEqual(self.timer.since_reset(), 1.0) |
2401 | |
2402 | self.reactor.advance(1) |
2403 | - self.assertEquals(self.timer.since_start(), 2.0) |
2404 | + self.assertEqual(self.timer.since_start(), 2.0) |
2405 | |
2406 | self.reactor.advance(2) |
2407 | self.timer.reset() |
2408 | - self.assertEquals(self.timer.since_start(), 4.0) |
2409 | + self.assertEqual(self.timer.since_start(), 4.0) |
2410 | |
2411 | |
2412 | class MonitorTest(ReactorHavingTest): |
2413 | @@ -44,25 +44,25 @@ |
2414 | self.monitor = Monitor("test", create_time=self.reactor.time) |
2415 | |
2416 | def test_ping(self): |
2417 | - self.assertEquals(self.monitor.count, 0) |
2418 | - self.assertEquals(self.monitor.total_count, 0) |
2419 | + self.assertEqual(self.monitor.count, 0) |
2420 | + self.assertEqual(self.monitor.total_count, 0) |
2421 | |
2422 | self.monitor.ping() |
2423 | - self.assertEquals(self.monitor.count, 1) |
2424 | - self.assertEquals(self.monitor.total_count, 1) |
2425 | + self.assertEqual(self.monitor.count, 1) |
2426 | + self.assertEqual(self.monitor.total_count, 1) |
2427 | |
2428 | def test_reset(self): |
2429 | - self.assertEquals(self.monitor.count, 0) |
2430 | + self.assertEqual(self.monitor.count, 0) |
2431 | |
2432 | self.monitor.ping() |
2433 | self.monitor.ping() |
2434 | - self.assertEquals(self.monitor.count, 2) |
2435 | - self.assertEquals(self.monitor.total_count, 2) |
2436 | + self.assertEqual(self.monitor.count, 2) |
2437 | + self.assertEqual(self.monitor.total_count, 2) |
2438 | |
2439 | self.monitor.reset() |
2440 | self.monitor.ping() |
2441 | - self.assertEquals(self.monitor.count, 1) |
2442 | - self.assertEquals(self.monitor.total_count, 3) |
2443 | + self.assertEqual(self.monitor.count, 1) |
2444 | + self.assertEqual(self.monitor.total_count, 3) |
2445 | |
2446 | def test_log(self): |
2447 | for i in range(100): |
2448 | @@ -169,39 +169,39 @@ |
2449 | If no time has passed and the monitor hasn't received any |
2450 | pings it should return 100%. |
2451 | """ |
2452 | - self.assertEquals(self.monitor.percent, 1.0) |
2453 | + self.assertEqual(self.monitor.percent, 1.0) |
2454 | |
2455 | def test_percent(self): |
2456 | self.reactor.advance(1) |
2457 | - self.assertEquals(self.monitor.percent, 0.0) |
2458 | + self.assertEqual(self.monitor.percent, 0.0) |
2459 | |
2460 | self.monitor.ping() |
2461 | self.reactor.advance(1) |
2462 | - self.assertEquals(self.monitor.percent, 0.5) |
2463 | + self.assertEqual(self.monitor.percent, 0.5) |
2464 | |
2465 | def test_percent_reset(self): |
2466 | self.reactor.advance(1) |
2467 | - self.assertEquals(self.monitor.percent, 0.0) |
2468 | + self.assertEqual(self.monitor.percent, 0.0) |
2469 | |
2470 | self.monitor.reset() |
2471 | self.monitor.ping() |
2472 | self.reactor.advance(1) |
2473 | - self.assertEquals(self.monitor.percent, 1.0) |
2474 | + self.assertEqual(self.monitor.percent, 1.0) |
2475 | |
2476 | def test_expected_count(self): |
2477 | self.reactor.advance(1) |
2478 | - self.assertEquals(self.monitor.expected_count, 1.0) |
2479 | + self.assertEqual(self.monitor.expected_count, 1.0) |
2480 | |
2481 | self.reactor.advance(1) |
2482 | - self.assertEquals(self.monitor.expected_count, 2.0) |
2483 | + self.assertEqual(self.monitor.expected_count, 2.0) |
2484 | |
2485 | def test_expected_count_reset(self): |
2486 | self.reactor.advance(1) |
2487 | - self.assertEquals(self.monitor.expected_count, 1.0) |
2488 | + self.assertEqual(self.monitor.expected_count, 1.0) |
2489 | |
2490 | self.monitor.reset() |
2491 | self.reactor.advance(1) |
2492 | - self.assertEquals(self.monitor.expected_count, 1.0) |
2493 | + self.assertEqual(self.monitor.expected_count, 1.0) |
2494 | |
2495 | def test_log(self): |
2496 | for i in range(100): |
2497 | @@ -229,13 +229,13 @@ |
2498 | create_time=self.reactor.time) |
2499 | |
2500 | def test_expected_count(self): |
2501 | - self.assertEquals(self.monitor.expected_count, 0) |
2502 | + self.assertEqual(self.monitor.expected_count, 0) |
2503 | |
2504 | self.reactor.advance(99) |
2505 | - self.assertEquals(self.monitor.expected_count, 0) |
2506 | + self.assertEqual(self.monitor.expected_count, 0) |
2507 | |
2508 | self.reactor.advance(1) |
2509 | - self.assertEquals(self.monitor.expected_count, 1) |
2510 | + self.assertEqual(self.monitor.expected_count, 1) |
2511 | |
2512 | def test_ping(self): |
2513 | self.assertFalse(self.monitor.warn()) |
2514 | |
2515 | === modified file 'landscape/lib/tests/test_persist.py' |
2516 | --- landscape/lib/tests/test_persist.py 2009-11-06 13:41:30 +0000 |
2517 | +++ landscape/lib/tests/test_persist.py 2011-07-06 21:14:28 +0000 |
2518 | @@ -22,14 +22,14 @@ |
2519 | |
2520 | def test_path_string_to_tuple(self): |
2521 | for path_string, path_tuple in self.paths: |
2522 | - self.assertEquals(path_string_to_tuple(path_string), path_tuple) |
2523 | + self.assertEqual(path_string_to_tuple(path_string), path_tuple) |
2524 | |
2525 | def test_path_string_to_tuple_error(self): |
2526 | self.assertRaises(PersistError, path_string_to_tuple, "ab[0][c]") |
2527 | |
2528 | def test_path_tuple_to_string(self): |
2529 | for path_string, path_tuple in self.paths: |
2530 | - self.assertEquals(path_tuple_to_string(path_tuple), path_string) |
2531 | + self.assertEqual(path_tuple_to_string(path_tuple), path_string) |
2532 | |
2533 | |
2534 | class BasePersistTest(LandscapeTest): |
2535 | @@ -125,60 +125,60 @@ |
2536 | for path, value in self.set_items: |
2537 | self.persist.set(path, value) |
2538 | result = self.persist.get((), hard=True) |
2539 | - self.assertEquals(result, self.set_result, |
2540 | - self.format(result, self.set_result)) |
2541 | + self.assertEqual(result, self.set_result, |
2542 | + self.format(result, self.set_result)) |
2543 | |
2544 | def test_set_tuple_paths(self): |
2545 | for path, value in self.set_items: |
2546 | self.persist.set(path_string_to_tuple(path), value) |
2547 | result = self.persist.get((), hard=True) |
2548 | - self.assertEquals(result, self.set_result, |
2549 | - self.format(result, self.set_result)) |
2550 | + self.assertEqual(result, self.set_result, |
2551 | + self.format(result, self.set_result)) |
2552 | |
2553 | def test_set_from_result(self): |
2554 | for path in self.set_result: |
2555 | self.persist.set(path, self.set_result[path]) |
2556 | result = self.persist.get((), hard=True) |
2557 | - self.assertEquals(result, self.set_result, |
2558 | - self.format(result, self.set_result)) |
2559 | + self.assertEqual(result, self.set_result, |
2560 | + self.format(result, self.set_result)) |
2561 | |
2562 | def test_get(self): |
2563 | for path in self.set_result: |
2564 | self.persist.set(path, self.set_result[path]) |
2565 | for path, value in self.get_items: |
2566 | - self.assertEquals(self.persist.get(path), value) |
2567 | + self.assertEqual(self.persist.get(path), value) |
2568 | |
2569 | def test_get_tuple_paths(self): |
2570 | for path in self.set_result: |
2571 | self.persist.set(path_string_to_tuple(path), self.set_result[path]) |
2572 | for path, value in self.get_items: |
2573 | - self.assertEquals(self.persist.get(path), value) |
2574 | + self.assertEqual(self.persist.get(path), value) |
2575 | |
2576 | def test_add(self): |
2577 | for path, value in self.add_items: |
2578 | self.persist.add(path, value) |
2579 | result = self.persist.get((), hard=True) |
2580 | - self.assertEquals(result, self.add_result, |
2581 | - self.format(result, self.add_result)) |
2582 | + self.assertEqual(result, self.add_result, |
2583 | + self.format(result, self.add_result)) |
2584 | |
2585 | def test_add_unique(self): |
2586 | self.persist.add("a", "b") |
2587 | - self.assertEquals(self.persist.get("a"), ["b"]) |
2588 | + self.assertEqual(self.persist.get("a"), ["b"]) |
2589 | self.persist.add("a", "b") |
2590 | - self.assertEquals(self.persist.get("a"), ["b", "b"]) |
2591 | + self.assertEqual(self.persist.get("a"), ["b", "b"]) |
2592 | self.persist.add("a", "b", unique=True) |
2593 | - self.assertEquals(self.persist.get("a"), ["b", "b"]) |
2594 | + self.assertEqual(self.persist.get("a"), ["b", "b"]) |
2595 | self.persist.add("a", "c", unique=True) |
2596 | - self.assertEquals(self.persist.get("a"), ["b", "b", "c"]) |
2597 | + self.assertEqual(self.persist.get("a"), ["b", "b", "c"]) |
2598 | |
2599 | def test_keys(self): |
2600 | self.persist.set("a", {"b": 1, "c": {"d": 2}, "e": list("foo")}) |
2601 | keys = self.persist.keys |
2602 | - self.assertEquals(set(keys((), hard=True)), set(["a"])) |
2603 | - self.assertEquals(set(keys("a")), set(["b", "c", "e"])) |
2604 | - self.assertEquals(set(keys("a.d")), set([])) |
2605 | - self.assertEquals(set(keys("a.e")), set([0, 1, 2])) |
2606 | - self.assertEquals(set(keys("a.f")), set([])) |
2607 | + self.assertEqual(set(keys((), hard=True)), set(["a"])) |
2608 | + self.assertEqual(set(keys("a")), set(["b", "c", "e"])) |
2609 | + self.assertEqual(set(keys("a.d")), set([])) |
2610 | + self.assertEqual(set(keys("a.e")), set([0, 1, 2])) |
2611 | + self.assertEqual(set(keys("a.f")), set([])) |
2612 | self.assertRaises(PersistError, keys, "a.b") |
2613 | |
2614 | def test_has(self): |
2615 | @@ -211,19 +211,19 @@ |
2616 | self.assertRaises(PersistError, remove, "a.c.d.e") |
2617 | |
2618 | self.assertTrue(remove(("a", "e", "o"))) |
2619 | - self.assertEquals(get("a.e"), ["f", "t"]) |
2620 | + self.assertEqual(get("a.e"), ["f", "t"]) |
2621 | |
2622 | self.assertFalse(remove("a.e[2]")) |
2623 | - self.assertEquals(get("a.e"), ["f", "t"]) |
2624 | + self.assertEqual(get("a.e"), ["f", "t"]) |
2625 | |
2626 | self.assertTrue(remove("a.e[1]")) |
2627 | - self.assertEquals(get("a.e"), ["f"]) |
2628 | + self.assertEqual(get("a.e"), ["f"]) |
2629 | |
2630 | self.assertTrue(remove("a.e", "f")) |
2631 | self.assertFalse(has("a.e")) |
2632 | |
2633 | self.assertFalse(remove("a.b[1]")) |
2634 | - self.assertEquals(get("a.b"), [1]) |
2635 | + self.assertEqual(get("a.b"), [1]) |
2636 | |
2637 | self.assertTrue(remove("a.b", 1)) |
2638 | self.assertFalse(has("a.b")) |
2639 | @@ -240,43 +240,43 @@ |
2640 | get = self.persist.get |
2641 | |
2642 | self.assertTrue(move("a.b", "a.c.b")) |
2643 | - self.assertEquals(get("a"), {"c": {"b": [1], "d": 2}}) |
2644 | + self.assertEqual(get("a"), {"c": {"b": [1], "d": 2}}) |
2645 | |
2646 | self.assertTrue(move("a.c.b[0]", "a.c.b")) |
2647 | - self.assertEquals(get("a"), {"c": {"b": 1, "d": 2}}) |
2648 | + self.assertEqual(get("a"), {"c": {"b": 1, "d": 2}}) |
2649 | |
2650 | self.assertTrue(move(("a", "c", "b"), ("a", "c", "b", 0))) |
2651 | - self.assertEquals(get("a"), {"c": {"b": [1], "d": 2}}) |
2652 | + self.assertEqual(get("a"), {"c": {"b": [1], "d": 2}}) |
2653 | |
2654 | def test_copy_values_on_set(self): |
2655 | d = {"b": 1} |
2656 | d_orig = d.copy() |
2657 | self.persist.set("a", d) |
2658 | d["c"] = 2 |
2659 | - self.assertEquals(self.persist.get("a"), d_orig) |
2660 | + self.assertEqual(self.persist.get("a"), d_orig) |
2661 | |
2662 | def test_copy_values_on_add(self): |
2663 | d = {"b": 1} |
2664 | d_orig = d.copy() |
2665 | self.persist.add("a", d) |
2666 | d["c"] = 2 |
2667 | - self.assertEquals(self.persist.get("a[0]"), d_orig) |
2668 | + self.assertEqual(self.persist.get("a[0]"), d_orig) |
2669 | |
2670 | def test_copy_values_on_get(self): |
2671 | self.persist.set("a", {"b": 1}) |
2672 | d = self.persist.get("a") |
2673 | d_orig = d.copy() |
2674 | d["c"] = 2 |
2675 | - self.assertEquals(self.persist.get("a"), d_orig) |
2676 | + self.assertEqual(self.persist.get("a"), d_orig) |
2677 | |
2678 | def test_root_at(self): |
2679 | rooted = self.persist.root_at("my-module") |
2680 | rooted.set("option", 1) |
2681 | - self.assertEquals(self.persist.get("my-module.option"), 1) |
2682 | + self.assertEqual(self.persist.get("my-module.option"), 1) |
2683 | |
2684 | |
2685 | class SaveLoadPersistTest(BasePersistTest): |
2686 | - |
2687 | + |
2688 | def test_readonly(self): |
2689 | self.assertFalse(self.persist.readonly) |
2690 | self.persist.readonly = True |
2691 | @@ -331,8 +331,8 @@ |
2692 | persist.load(filename) |
2693 | |
2694 | result = persist.get((), hard=True) |
2695 | - self.assertEquals(result, self.set_result, |
2696 | - self.format(result, self.set_result)) |
2697 | + self.assertEqual(result, self.set_result, |
2698 | + self.format(result, self.set_result)) |
2699 | |
2700 | def test_save_on_unexistent_dir(self): |
2701 | dirname = self.makeFile() |
2702 | @@ -379,7 +379,7 @@ |
2703 | persist.save() |
2704 | |
2705 | persist = self.build_persist(filename=filename) |
2706 | - self.assertEquals(persist.get("foo"), "bar") |
2707 | + self.assertEqual(persist.get("foo"), "bar") |
2708 | |
2709 | def test_load_restores_backup(self): |
2710 | filename = self.makePersistFile("foobar") |
2711 | @@ -391,7 +391,7 @@ |
2712 | persist = self.build_persist() |
2713 | persist.load(filename) |
2714 | |
2715 | - self.assertEquals(persist.get("a"), 1) |
2716 | + self.assertEqual(persist.get("a"), 1) |
2717 | |
2718 | def test_load_empty_files_wont_break(self): |
2719 | filename = self.makeFile("") |
2720 | |
2721 | === modified file 'landscape/lib/tests/test_process.py' |
2722 | --- landscape/lib/tests/test_process.py 2010-02-08 15:27:19 +0000 |
2723 | +++ landscape/lib/tests/test_process.py 2011-07-06 21:14:28 +0000 |
2724 | @@ -11,7 +11,7 @@ |
2725 | """ |
2726 | We use os.listdir("/proc") to get the list of active processes, if a |
2727 | process ends before we attempt to read the process' information, then |
2728 | - this should not trigger an error. |
2729 | + this should not trigger an error. |
2730 | """ |
2731 | listdir_mock = self.mocker.replace("os.listdir") |
2732 | listdir_mock("/proc") |
2733 | @@ -48,7 +48,7 @@ |
2734 | |
2735 | process_info = ProcessInformation("/proc") |
2736 | processes = list(process_info.get_all_process_info()) |
2737 | - self.assertEquals(processes, []) |
2738 | + self.assertEqual(processes, []) |
2739 | self.assertTrue(fakefile1.closed) |
2740 | self.assertTrue(fakefile2.closed) |
2741 | |
2742 | @@ -74,7 +74,7 @@ |
2743 | """ |
2744 | |
2745 | def test_calculate_pcpu_real_data(self): |
2746 | - self.assertEquals( |
2747 | + self.assertEqual( |
2748 | calculate_pcpu(51286, 5000, 19000.07, 9281.0, 100), 3.0) |
2749 | |
2750 | def test_calculate_pcpu(self): |
2751 | @@ -84,8 +84,8 @@ |
2752 | |
2753 | This should be cpu utilisation of 20% |
2754 | """ |
2755 | - self.assertEquals(calculate_pcpu(8000, 2000, 1000, 50000, 100), |
2756 | - 20.0) |
2757 | + self.assertEqual(calculate_pcpu(8000, 2000, 1000, 50000, 100), |
2758 | + 20.0) |
2759 | |
2760 | def test_calculate_pcpu_capped(self): |
2761 | """ |
2762 | @@ -95,12 +95,12 @@ |
2763 | This should be cpu utilisation of 200% but capped at 99% CPU |
2764 | utilisation. |
2765 | """ |
2766 | - self.assertEquals(calculate_pcpu(98000, 2000, 1000, 50000, 100), |
2767 | - 99.0) |
2768 | + self.assertEqual(calculate_pcpu(98000, 2000, 1000, 50000, 100), |
2769 | + 99.0) |
2770 | |
2771 | def test_calculate_pcpu_floored(self): |
2772 | """ |
2773 | This calculates the pcpu based on 1 jiffies allocated to a process |
2774 | over 80 jiffies this should be negative, but floored to 0.0. |
2775 | """ |
2776 | - self.assertEquals(calculate_pcpu(1, 0, 50, 800, 10), 0.0) |
2777 | + self.assertEqual(calculate_pcpu(1, 0, 50, 800, 10), 0.0) |
2778 | |
2779 | === modified file 'landscape/lib/tests/test_scriptcontent.py' |
2780 | --- landscape/lib/tests/test_scriptcontent.py 2008-09-18 22:09:56 +0000 |
2781 | +++ landscape/lib/tests/test_scriptcontent.py 2011-07-06 21:14:28 +0000 |
2782 | @@ -3,21 +3,22 @@ |
2783 | from landscape.lib.scriptcontent import (build_script, |
2784 | generate_script_hash) |
2785 | |
2786 | + |
2787 | class ScriptContentTest(unittest.TestCase): |
2788 | |
2789 | def test_concatenate(self): |
2790 | - self.assertEquals(build_script(u"/bin/sh", u"echo 1.0\n"), |
2791 | - "#!/bin/sh\necho 1.0\n") |
2792 | + self.assertEqual(build_script(u"/bin/sh", u"echo 1.0\n"), |
2793 | + "#!/bin/sh\necho 1.0\n") |
2794 | |
2795 | def test_concatenate_null_strings(self): |
2796 | - self.assertEquals(build_script(None, None), |
2797 | - "#!\n") |
2798 | + self.assertEqual(build_script(None, None), |
2799 | + "#!\n") |
2800 | |
2801 | def test_generate_script_hash(self): |
2802 | hash1 = generate_script_hash("#!/bin/sh\necho 1.0\n") |
2803 | hash2 = generate_script_hash("#!/bin/sh\necho 1.0\n") |
2804 | hash3 = generate_script_hash("#!/bin/sh\necho 3.0\n") |
2805 | |
2806 | - self.assertEquals(hash1, hash2) |
2807 | + self.assertEqual(hash1, hash2) |
2808 | self.assertNotEqual(hash1, hash3) |
2809 | self.assertTrue(isinstance(hash1, str)) |
2810 | |
2811 | === modified file 'landscape/lib/tests/test_sequenceranges.py' |
2812 | --- landscape/lib/tests/test_sequenceranges.py 2011-01-28 14:06:10 +0000 |
2813 | +++ landscape/lib/tests/test_sequenceranges.py 2011-07-06 21:14:28 +0000 |
2814 | @@ -12,35 +12,35 @@ |
2815 | self.sequence = [1, 2, 15, 16, 17, 19, 21, 22, 23, 24, 26, 27] |
2816 | |
2817 | def test_empty_to_sequence(self): |
2818 | - self.assertEquals(SequenceRanges().to_sequence(), []) |
2819 | + self.assertEqual(SequenceRanges().to_sequence(), []) |
2820 | |
2821 | def test_empty_to_ranges(self): |
2822 | - self.assertEquals(SequenceRanges().to_ranges(), []) |
2823 | + self.assertEqual(SequenceRanges().to_ranges(), []) |
2824 | |
2825 | def test_from_to_sequence(self): |
2826 | obj = SequenceRanges.from_sequence(self.sequence) |
2827 | - self.assertEquals(obj.to_sequence(), self.sequence) |
2828 | + self.assertEqual(obj.to_sequence(), self.sequence) |
2829 | |
2830 | def test_from_to_ranges(self): |
2831 | obj = SequenceRanges.from_ranges(self.ranges) |
2832 | - self.assertEquals(obj.to_ranges(), self.ranges) |
2833 | + self.assertEqual(obj.to_ranges(), self.ranges) |
2834 | |
2835 | def test_to_ranges_immutable(self): |
2836 | obj = SequenceRanges.from_ranges(self.ranges) |
2837 | obj.to_ranges().append(123) |
2838 | - self.assertEquals(obj.to_ranges(), self.ranges) |
2839 | + self.assertEqual(obj.to_ranges(), self.ranges) |
2840 | |
2841 | def test_from_sequence_to_ranges(self): |
2842 | obj = SequenceRanges.from_sequence(self.sequence) |
2843 | - self.assertEquals(list(obj.to_ranges()), self.ranges) |
2844 | + self.assertEqual(list(obj.to_ranges()), self.ranges) |
2845 | |
2846 | def test_from_ranges_to_sequence(self): |
2847 | obj = SequenceRanges.from_ranges(self.ranges) |
2848 | - self.assertEquals(list(obj.to_sequence()), self.sequence) |
2849 | + self.assertEqual(list(obj.to_sequence()), self.sequence) |
2850 | |
2851 | def test_iter(self): |
2852 | obj = SequenceRanges.from_ranges(self.ranges) |
2853 | - self.assertEquals(list(obj), self.sequence) |
2854 | + self.assertEqual(list(obj), self.sequence) |
2855 | |
2856 | def test_contains(self): |
2857 | obj = SequenceRanges.from_ranges(self.ranges) |
2858 | @@ -61,44 +61,44 @@ |
2859 | def test_add(self): |
2860 | obj = SequenceRanges() |
2861 | obj.add(1) |
2862 | - self.assertEquals(obj.to_ranges(), [1]) |
2863 | + self.assertEqual(obj.to_ranges(), [1]) |
2864 | obj.add(2) |
2865 | - self.assertEquals(obj.to_ranges(), [1, 2]) |
2866 | - obj.add(3) |
2867 | - self.assertEquals(obj.to_ranges(), [(1, 3)]) |
2868 | - obj.add(3) |
2869 | - self.assertEquals(obj.to_ranges(), [(1, 3)]) |
2870 | + self.assertEqual(obj.to_ranges(), [1, 2]) |
2871 | + obj.add(3) |
2872 | + self.assertEqual(obj.to_ranges(), [(1, 3)]) |
2873 | + obj.add(3) |
2874 | + self.assertEqual(obj.to_ranges(), [(1, 3)]) |
2875 | |
2876 | def test_remove(self): |
2877 | obj = SequenceRanges.from_ranges([(1, 3)]) |
2878 | obj.remove(2) |
2879 | - self.assertEquals(obj.to_ranges(), [1, 3]) |
2880 | + self.assertEqual(obj.to_ranges(), [1, 3]) |
2881 | obj.remove(1) |
2882 | - self.assertEquals(obj.to_ranges(), [3]) |
2883 | + self.assertEqual(obj.to_ranges(), [3]) |
2884 | obj.remove(3) |
2885 | - self.assertEquals(obj.to_ranges(), []) |
2886 | + self.assertEqual(obj.to_ranges(), []) |
2887 | obj.remove(4) |
2888 | - self.assertEquals(obj.to_ranges(), []) |
2889 | + self.assertEqual(obj.to_ranges(), []) |
2890 | |
2891 | |
2892 | class SequenceToRangesTest(unittest.TestCase): |
2893 | |
2894 | def test_empty(self): |
2895 | - self.assertEquals(list(sequence_to_ranges([])), []) |
2896 | + self.assertEqual(list(sequence_to_ranges([])), []) |
2897 | |
2898 | def test_one_element(self): |
2899 | - self.assertEquals(list(sequence_to_ranges([1])), [1]) |
2900 | + self.assertEqual(list(sequence_to_ranges([1])), [1]) |
2901 | |
2902 | def test_two_elements(self): |
2903 | - self.assertEquals(list(sequence_to_ranges([1, 2])), [1, 2]) |
2904 | + self.assertEqual(list(sequence_to_ranges([1, 2])), [1, 2]) |
2905 | |
2906 | def test_three_elements(self): |
2907 | - self.assertEquals(list(sequence_to_ranges([1, 2, 3])), [(1, 3)]) |
2908 | + self.assertEqual(list(sequence_to_ranges([1, 2, 3])), [(1, 3)]) |
2909 | |
2910 | def test_many_elements(self): |
2911 | sequence = [1, 2, 15, 16, 17, 19, 21, 22, 23, 24, 26, 27] |
2912 | - self.assertEquals(list(sequence_to_ranges(sequence)), |
2913 | - [1, 2, (15, 17), 19, (21, 24), 26, 27]) |
2914 | + self.assertEqual(list(sequence_to_ranges(sequence)), |
2915 | + [1, 2, (15, 17), 19, (21, 24), 26, 27]) |
2916 | |
2917 | def test_out_of_order(self): |
2918 | self.assertRaises(SequenceError, sequence_to_ranges([2, 1]).next) |
2919 | @@ -110,59 +110,59 @@ |
2920 | class RangesToSequenceTest(unittest.TestCase): |
2921 | |
2922 | def test_empty(self): |
2923 | - self.assertEquals(list(ranges_to_sequence([])), []) |
2924 | + self.assertEqual(list(ranges_to_sequence([])), []) |
2925 | |
2926 | def test_one_element(self): |
2927 | - self.assertEquals(list(ranges_to_sequence([1])), [1]) |
2928 | + self.assertEqual(list(ranges_to_sequence([1])), [1]) |
2929 | |
2930 | def test_two_elements(self): |
2931 | - self.assertEquals(list(ranges_to_sequence([1, 2])), [1, 2]) |
2932 | + self.assertEqual(list(ranges_to_sequence([1, 2])), [1, 2]) |
2933 | |
2934 | def test_three_elements(self): |
2935 | - self.assertEquals(list(ranges_to_sequence([(1, 3)])), [1, 2, 3]) |
2936 | + self.assertEqual(list(ranges_to_sequence([(1, 3)])), [1, 2, 3]) |
2937 | |
2938 | def test_many_elements(self): |
2939 | ranges = [1, 2, (15, 17), 19, (21, 24), 26, 27] |
2940 | - self.assertEquals(list(ranges_to_sequence(ranges)), |
2941 | - [1, 2, 15, 16, 17, 19, 21, 22, 23, 24, 26, 27]) |
2942 | + self.assertEqual(list(ranges_to_sequence(ranges)), |
2943 | + [1, 2, 15, 16, 17, 19, 21, 22, 23, 24, 26, 27]) |
2944 | |
2945 | |
2946 | class FindRangesIndexTest(unittest.TestCase): |
2947 | |
2948 | def test_empty(self): |
2949 | - self.assertEquals(find_ranges_index([], 2), 0) |
2950 | + self.assertEqual(find_ranges_index([], 2), 0) |
2951 | |
2952 | def test_sequence(self): |
2953 | - self.assertEquals(find_ranges_index([1, 2, 3, 4, 5], 0), 0) |
2954 | - self.assertEquals(find_ranges_index([1, 2, 3, 4, 5], 1), 0) |
2955 | - self.assertEquals(find_ranges_index([1, 2, 3, 4, 5], 2), 1) |
2956 | - self.assertEquals(find_ranges_index([1, 2, 3, 4, 5], 3), 2) |
2957 | - self.assertEquals(find_ranges_index([1, 2, 3, 4, 5], 4), 3) |
2958 | - self.assertEquals(find_ranges_index([1, 2, 3, 4, 5], 5), 4) |
2959 | - self.assertEquals(find_ranges_index([1, 2, 3, 4, 5], 6), 5) |
2960 | + self.assertEqual(find_ranges_index([1, 2, 3, 4, 5], 0), 0) |
2961 | + self.assertEqual(find_ranges_index([1, 2, 3, 4, 5], 1), 0) |
2962 | + self.assertEqual(find_ranges_index([1, 2, 3, 4, 5], 2), 1) |
2963 | + self.assertEqual(find_ranges_index([1, 2, 3, 4, 5], 3), 2) |
2964 | + self.assertEqual(find_ranges_index([1, 2, 3, 4, 5], 4), 3) |
2965 | + self.assertEqual(find_ranges_index([1, 2, 3, 4, 5], 5), 4) |
2966 | + self.assertEqual(find_ranges_index([1, 2, 3, 4, 5], 6), 5) |
2967 | |
2968 | def test_sequence_with_missing(self): |
2969 | - self.assertEquals(find_ranges_index([1, 2, 4, 5], 2), 1) |
2970 | - self.assertEquals(find_ranges_index([1, 2, 4, 5], 3), 2) |
2971 | - self.assertEquals(find_ranges_index([1, 2, 4, 5], 4), 2) |
2972 | + self.assertEqual(find_ranges_index([1, 2, 4, 5], 2), 1) |
2973 | + self.assertEqual(find_ranges_index([1, 2, 4, 5], 3), 2) |
2974 | + self.assertEqual(find_ranges_index([1, 2, 4, 5], 4), 2) |
2975 | |
2976 | def test_range(self): |
2977 | - self.assertEquals(find_ranges_index([1, (2, 4), 5], 0), 0) |
2978 | - self.assertEquals(find_ranges_index([1, (2, 4), 5], 1), 0) |
2979 | - self.assertEquals(find_ranges_index([1, (2, 4), 5], 2), 1) |
2980 | - self.assertEquals(find_ranges_index([1, (2, 4), 5], 3), 1) |
2981 | - self.assertEquals(find_ranges_index([1, (2, 4), 5], 4), 1) |
2982 | - self.assertEquals(find_ranges_index([1, (2, 4), 5], 5), 2) |
2983 | - self.assertEquals(find_ranges_index([1, (2, 4), 5], 6), 3) |
2984 | + self.assertEqual(find_ranges_index([1, (2, 4), 5], 0), 0) |
2985 | + self.assertEqual(find_ranges_index([1, (2, 4), 5], 1), 0) |
2986 | + self.assertEqual(find_ranges_index([1, (2, 4), 5], 2), 1) |
2987 | + self.assertEqual(find_ranges_index([1, (2, 4), 5], 3), 1) |
2988 | + self.assertEqual(find_ranges_index([1, (2, 4), 5], 4), 1) |
2989 | + self.assertEqual(find_ranges_index([1, (2, 4), 5], 5), 2) |
2990 | + self.assertEqual(find_ranges_index([1, (2, 4), 5], 6), 3) |
2991 | |
2992 | def test_range_with_missing(self): |
2993 | - self.assertEquals(find_ranges_index([1, (3, 4), 5], 0), 0) |
2994 | - self.assertEquals(find_ranges_index([1, (3, 4), 5], 1), 0) |
2995 | - self.assertEquals(find_ranges_index([1, (3, 4), 5], 2), 1) |
2996 | - self.assertEquals(find_ranges_index([1, (3, 4), 5], 3), 1) |
2997 | - self.assertEquals(find_ranges_index([1, (3, 4), 5], 4), 1) |
2998 | - self.assertEquals(find_ranges_index([1, (3, 4), 5], 5), 2) |
2999 | - self.assertEquals(find_ranges_index([1, (3, 4), 5], 6), 3) |
3000 | + self.assertEqual(find_ranges_index([1, (3, 4), 5], 0), 0) |
3001 | + self.assertEqual(find_ranges_index([1, (3, 4), 5], 1), 0) |
3002 | + self.assertEqual(find_ranges_index([1, (3, 4), 5], 2), 1) |
3003 | + self.assertEqual(find_ranges_index([1, (3, 4), 5], 3), 1) |
3004 | + self.assertEqual(find_ranges_index([1, (3, 4), 5], 4), 1) |
3005 | + self.assertEqual(find_ranges_index([1, (3, 4), 5], 5), 2) |
3006 | + self.assertEqual(find_ranges_index([1, (3, 4), 5], 6), 3) |
3007 | |
3008 | |
3009 | class AddToRangesTest(unittest.TestCase): |
3010 | @@ -170,61 +170,61 @@ |
3011 | def test_empty(self): |
3012 | ranges = [] |
3013 | add_to_ranges(ranges, 1) |
3014 | - self.assertEquals(ranges, [1]) |
3015 | + self.assertEqual(ranges, [1]) |
3016 | |
3017 | def test_append(self): |
3018 | ranges = [1] |
3019 | add_to_ranges(ranges, 2) |
3020 | - self.assertEquals(ranges, [1, 2]) |
3021 | + self.assertEqual(ranges, [1, 2]) |
3022 | |
3023 | def test_prepend(self): |
3024 | ranges = [2] |
3025 | add_to_ranges(ranges, 1) |
3026 | - self.assertEquals(ranges, [1, 2]) |
3027 | + self.assertEqual(ranges, [1, 2]) |
3028 | |
3029 | def test_insert(self): |
3030 | ranges = [1, 4] |
3031 | add_to_ranges(ranges, 2) |
3032 | - self.assertEquals(ranges, [1, 2, 4]) |
3033 | + self.assertEqual(ranges, [1, 2, 4]) |
3034 | |
3035 | def test_merge_sequence(self): |
3036 | ranges = [1, 2, 4, 5] |
3037 | add_to_ranges(ranges, 3) |
3038 | - self.assertEquals(ranges, [(1, 5)]) |
3039 | + self.assertEqual(ranges, [(1, 5)]) |
3040 | |
3041 | def test_merge_ranges(self): |
3042 | ranges = [(1, 3), (5, 7)] |
3043 | add_to_ranges(ranges, 4) |
3044 | - self.assertEquals(ranges, [(1, 7)]) |
3045 | + self.assertEqual(ranges, [(1, 7)]) |
3046 | |
3047 | def test_merge_sequence_and_ranges(self): |
3048 | ranges = [(1, 3), 5, 6, 7] |
3049 | add_to_ranges(ranges, 4) |
3050 | - self.assertEquals(ranges, [(1, 7)]) |
3051 | + self.assertEqual(ranges, [(1, 7)]) |
3052 | |
3053 | def test_merge_sequence_and_ranges_with_gaps(self): |
3054 | ranges = [1, (3, 5), 7, 9] |
3055 | add_to_ranges(ranges, 6) |
3056 | - self.assertEquals(ranges, [1, (3, 7), 9]) |
3057 | + self.assertEqual(ranges, [1, (3, 7), 9]) |
3058 | |
3059 | def test_dont_merge_ranges_with_gap(self): |
3060 | ranges = [(1, 3), (7, 9)] |
3061 | add_to_ranges(ranges, 5) |
3062 | - self.assertEquals(ranges, [(1, 3), 5, (7, 9)]) |
3063 | + self.assertEqual(ranges, [(1, 3), 5, (7, 9)]) |
3064 | |
3065 | def test_duplicate(self): |
3066 | ranges = [1] |
3067 | add_to_ranges(ranges, 1) |
3068 | - self.assertEquals(ranges, [1]) |
3069 | + self.assertEqual(ranges, [1]) |
3070 | |
3071 | def test_duplicate_in_range(self): |
3072 | ranges = [(1, 3)] |
3073 | add_to_ranges(ranges, 1) |
3074 | - self.assertEquals(ranges, [(1, 3)]) |
3075 | + self.assertEqual(ranges, [(1, 3)]) |
3076 | add_to_ranges(ranges, 2) |
3077 | - self.assertEquals(ranges, [(1, 3)]) |
3078 | + self.assertEqual(ranges, [(1, 3)]) |
3079 | add_to_ranges(ranges, 3) |
3080 | - self.assertEquals(ranges, [(1, 3)]) |
3081 | + self.assertEqual(ranges, [(1, 3)]) |
3082 | |
3083 | |
3084 | class RemoveFromRangesTest(unittest.TestCase): |
3085 | @@ -232,57 +232,57 @@ |
3086 | def test_empty(self): |
3087 | ranges = [] |
3088 | remove_from_ranges(ranges, 1) |
3089 | - self.assertEquals(ranges, []) |
3090 | + self.assertEqual(ranges, []) |
3091 | |
3092 | def test_single(self): |
3093 | ranges = [1] |
3094 | remove_from_ranges(ranges, 1) |
3095 | - self.assertEquals(ranges, []) |
3096 | + self.assertEqual(ranges, []) |
3097 | |
3098 | def test_remove_before(self): |
3099 | ranges = [1, 2] |
3100 | remove_from_ranges(ranges, 1) |
3101 | - self.assertEquals(ranges, [2]) |
3102 | + self.assertEqual(ranges, [2]) |
3103 | |
3104 | def test_remove_after(self): |
3105 | ranges = [1, 2] |
3106 | remove_from_ranges(ranges, 2) |
3107 | - self.assertEquals(ranges, [1]) |
3108 | + self.assertEqual(ranges, [1]) |
3109 | |
3110 | def test_remove_inside(self): |
3111 | ranges = [1, 2, 3] |
3112 | remove_from_ranges(ranges, 2) |
3113 | - self.assertEquals(ranges, [1, 3]) |
3114 | + self.assertEqual(ranges, [1, 3]) |
3115 | |
3116 | def test_remove_unexistent(self): |
3117 | ranges = [1, 3] |
3118 | remove_from_ranges(ranges, 2) |
3119 | - self.assertEquals(ranges, [1, 3]) |
3120 | + self.assertEqual(ranges, [1, 3]) |
3121 | |
3122 | def test_split_range(self): |
3123 | ranges = [(1, 5)] |
3124 | remove_from_ranges(ranges, 3) |
3125 | - self.assertEquals(ranges, [1, 2, 4, 5]) |
3126 | + self.assertEqual(ranges, [1, 2, 4, 5]) |
3127 | |
3128 | def test_split_range_into_ranges(self): |
3129 | ranges = [(1, 7)] |
3130 | remove_from_ranges(ranges, 4) |
3131 | - self.assertEquals(ranges, [(1, 3), (5, 7)]) |
3132 | + self.assertEqual(ranges, [(1, 3), (5, 7)]) |
3133 | |
3134 | def test_decrement_left(self): |
3135 | ranges = [(1, 5)] |
3136 | remove_from_ranges(ranges, 1) |
3137 | - self.assertEquals(ranges, [(2, 5)]) |
3138 | + self.assertEqual(ranges, [(2, 5)]) |
3139 | |
3140 | def test_decrement_right(self): |
3141 | ranges = [(1, 5)] |
3142 | remove_from_ranges(ranges, 5) |
3143 | - self.assertEquals(ranges, [(1, 4)]) |
3144 | + self.assertEqual(ranges, [(1, 4)]) |
3145 | |
3146 | def test_dont_removing_unmatched_range(self): |
3147 | ranges = [(1, 3), (5, 7)] |
3148 | remove_from_ranges(ranges, 4) |
3149 | - self.assertEquals(ranges, [(1, 3), (5, 7)]) |
3150 | + self.assertEqual(ranges, [(1, 3), (5, 7)]) |
3151 | |
3152 | |
3153 | def test_suite(): |
3154 | |
3155 | === modified file 'landscape/lib/tests/test_sysstats.py' |
3156 | --- landscape/lib/tests/test_sysstats.py 2009-08-07 22:36:33 +0000 |
3157 | +++ landscape/lib/tests/test_sysstats.py 2011-07-06 21:14:28 +0000 |
3158 | @@ -38,29 +38,29 @@ |
3159 | def test_get_memory_info(self): |
3160 | filename = self.makeFile(SAMPLE_MEMORY_INFO) |
3161 | memstats = MemoryStats(filename) |
3162 | - self.assertEquals(memstats.total_memory, 1510) |
3163 | - self.assertEquals(memstats.free_memory, 503) |
3164 | - self.assertEquals(memstats.used_memory, 1007) |
3165 | - self.assertEquals(memstats.total_swap, 1584) |
3166 | - self.assertEquals(memstats.free_swap, 1567) |
3167 | - self.assertEquals(memstats.used_swap, 17) |
3168 | - self.assertEquals("%.2f" % memstats.free_memory_percentage, "33.31") |
3169 | - self.assertEquals("%.2f" % memstats.free_swap_percentage, "98.93") |
3170 | - self.assertEquals("%.2f" % memstats.used_memory_percentage, "66.69") |
3171 | - self.assertEquals("%.2f" % memstats.used_swap_percentage, "1.07") |
3172 | + self.assertEqual(memstats.total_memory, 1510) |
3173 | + self.assertEqual(memstats.free_memory, 503) |
3174 | + self.assertEqual(memstats.used_memory, 1007) |
3175 | + self.assertEqual(memstats.total_swap, 1584) |
3176 | + self.assertEqual(memstats.free_swap, 1567) |
3177 | + self.assertEqual(memstats.used_swap, 17) |
3178 | + self.assertEqual("%.2f" % memstats.free_memory_percentage, "33.31") |
3179 | + self.assertEqual("%.2f" % memstats.free_swap_percentage, "98.93") |
3180 | + self.assertEqual("%.2f" % memstats.used_memory_percentage, "66.69") |
3181 | + self.assertEqual("%.2f" % memstats.used_swap_percentage, "1.07") |
3182 | |
3183 | def test_get_memory_info_without_swap(self): |
3184 | sample = re.subn(r"Swap(Free|Total): *\d+ kB", r"Swap\1: 0", |
3185 | SAMPLE_MEMORY_INFO)[0] |
3186 | filename = self.makeFile(sample) |
3187 | memstats = MemoryStats(filename) |
3188 | - self.assertEquals(memstats.total_swap, 0) |
3189 | - self.assertEquals(memstats.free_swap, 0) |
3190 | - self.assertEquals(memstats.used_swap, 0) |
3191 | - self.assertEquals(memstats.used_swap_percentage, 0) |
3192 | - self.assertEquals(memstats.free_swap_percentage, 0) |
3193 | - self.assertEquals(type(memstats.used_swap_percentage), float) |
3194 | - self.assertEquals(type(memstats.free_swap_percentage), float) |
3195 | + self.assertEqual(memstats.total_swap, 0) |
3196 | + self.assertEqual(memstats.free_swap, 0) |
3197 | + self.assertEqual(memstats.used_swap, 0) |
3198 | + self.assertEqual(memstats.used_swap_percentage, 0) |
3199 | + self.assertEqual(memstats.free_swap_percentage, 0) |
3200 | + self.assertEqual(type(memstats.used_swap_percentage), float) |
3201 | + self.assertEqual(type(memstats.free_swap_percentage), float) |
3202 | |
3203 | |
3204 | class FakeWhoQTest(LandscapeTest): |
3205 | @@ -68,7 +68,7 @@ |
3206 | helpers = [EnvironSaverHelper] |
3207 | |
3208 | def fake_who(self, users): |
3209 | - dirname = self.makeDir() |
3210 | + dirname = self.makeDir() |
3211 | os.environ["PATH"] = "%s:%s" % (dirname, os.environ["PATH"]) |
3212 | |
3213 | self.who_path = os.path.join(dirname, "who") |
3214 | @@ -87,19 +87,19 @@ |
3215 | def test_one_user(self): |
3216 | self.fake_who("joe") |
3217 | result = get_logged_in_users() |
3218 | - result.addCallback(self.assertEquals, ["joe"]) |
3219 | + result.addCallback(self.assertEqual, ["joe"]) |
3220 | return result |
3221 | |
3222 | def test_one_user_multiple_times(self): |
3223 | self.fake_who("joe joe joe joe") |
3224 | result = get_logged_in_users() |
3225 | - result.addCallback(self.assertEquals, ["joe"]) |
3226 | + result.addCallback(self.assertEqual, ["joe"]) |
3227 | return result |
3228 | |
3229 | def test_many_users(self): |
3230 | self.fake_who("joe moe boe doe") |
3231 | result = get_logged_in_users() |
3232 | - result.addCallback(self.assertEquals, ["boe", "doe", "joe", "moe"]) |
3233 | + result.addCallback(self.assertEqual, ["boe", "doe", "joe", "moe"]) |
3234 | return result |
3235 | |
3236 | def test_command_error(self): |
3237 | @@ -108,9 +108,10 @@ |
3238 | who.write("#!/bin/sh\necho ERROR 1>&2\nexit 1\n") |
3239 | who.close() |
3240 | result = get_logged_in_users() |
3241 | + |
3242 | def assert_failure(failure): |
3243 | failure.trap(CommandError) |
3244 | - self.assertEquals(str(failure.value), "ERROR\n") |
3245 | + self.assertEqual(str(failure.value), "ERROR\n") |
3246 | result.addErrback(assert_failure) |
3247 | return result |
3248 | |
3249 | @@ -137,50 +138,50 @@ |
3250 | |
3251 | def test_non_existent_thermal_zone_directory(self): |
3252 | thermal_zones = list(get_thermal_zones("/non-existent/thermal_zone")) |
3253 | - self.assertEquals(thermal_zones, []) |
3254 | + self.assertEqual(thermal_zones, []) |
3255 | |
3256 | def test_empty_thermal_zone_directory(self): |
3257 | - self.assertEquals(self.get_thermal_zones(), []) |
3258 | + self.assertEqual(self.get_thermal_zones(), []) |
3259 | |
3260 | def test_one_thermal_zone(self): |
3261 | self.write_thermal_zone("THM0", "50 C") |
3262 | thermal_zones = self.get_thermal_zones() |
3263 | - self.assertEquals(len(thermal_zones), 1) |
3264 | + self.assertEqual(len(thermal_zones), 1) |
3265 | |
3266 | - self.assertEquals(thermal_zones[0].name, "THM0") |
3267 | - self.assertEquals(thermal_zones[0].temperature, "50 C") |
3268 | - self.assertEquals(thermal_zones[0].temperature_value, 50) |
3269 | - self.assertEquals(thermal_zones[0].temperature_unit, "C") |
3270 | - self.assertEquals(thermal_zones[0].path, |
3271 | - os.path.join(self.thermal_zone_path, "THM0")) |
3272 | + self.assertEqual(thermal_zones[0].name, "THM0") |
3273 | + self.assertEqual(thermal_zones[0].temperature, "50 C") |
3274 | + self.assertEqual(thermal_zones[0].temperature_value, 50) |
3275 | + self.assertEqual(thermal_zones[0].temperature_unit, "C") |
3276 | + self.assertEqual(thermal_zones[0].path, |
3277 | + os.path.join(self.thermal_zone_path, "THM0")) |
3278 | |
3279 | def test_two_thermal_zones(self): |
3280 | self.write_thermal_zone("THM0", "50 C") |
3281 | self.write_thermal_zone("THM1", "51 C") |
3282 | thermal_zones = self.get_thermal_zones() |
3283 | - self.assertEquals(len(thermal_zones), 2) |
3284 | - self.assertEquals(thermal_zones[0].temperature, "50 C") |
3285 | - self.assertEquals(thermal_zones[0].temperature_value, 50) |
3286 | - self.assertEquals(thermal_zones[0].temperature_unit, "C") |
3287 | - self.assertEquals(thermal_zones[1].temperature, "51 C") |
3288 | - self.assertEquals(thermal_zones[1].temperature_value, 51) |
3289 | - self.assertEquals(thermal_zones[1].temperature_unit, "C") |
3290 | + self.assertEqual(len(thermal_zones), 2) |
3291 | + self.assertEqual(thermal_zones[0].temperature, "50 C") |
3292 | + self.assertEqual(thermal_zones[0].temperature_value, 50) |
3293 | + self.assertEqual(thermal_zones[0].temperature_unit, "C") |
3294 | + self.assertEqual(thermal_zones[1].temperature, "51 C") |
3295 | + self.assertEqual(thermal_zones[1].temperature_value, 51) |
3296 | + self.assertEqual(thermal_zones[1].temperature_unit, "C") |
3297 | |
3298 | def test_badly_formatted_temperature(self): |
3299 | self.write_thermal_zone("THM0", "SOMETHING BAD") |
3300 | thermal_zones = self.get_thermal_zones() |
3301 | - self.assertEquals(len(thermal_zones), 1) |
3302 | - self.assertEquals(thermal_zones[0].temperature, "SOMETHING BAD") |
3303 | - self.assertEquals(thermal_zones[0].temperature_value, None) |
3304 | - self.assertEquals(thermal_zones[0].temperature_unit, None) |
3305 | + self.assertEqual(len(thermal_zones), 1) |
3306 | + self.assertEqual(thermal_zones[0].temperature, "SOMETHING BAD") |
3307 | + self.assertEqual(thermal_zones[0].temperature_value, None) |
3308 | + self.assertEqual(thermal_zones[0].temperature_unit, None) |
3309 | |
3310 | def test_badly_formatted_with_missing_space(self): |
3311 | self.write_thermal_zone("THM0", "SOMETHINGBAD") |
3312 | thermal_zones = self.get_thermal_zones() |
3313 | - self.assertEquals(len(thermal_zones), 1) |
3314 | - self.assertEquals(thermal_zones[0].temperature, "SOMETHINGBAD") |
3315 | - self.assertEquals(thermal_zones[0].temperature_value, None) |
3316 | - self.assertEquals(thermal_zones[0].temperature_unit, None) |
3317 | + self.assertEqual(len(thermal_zones), 1) |
3318 | + self.assertEqual(thermal_zones[0].temperature, "SOMETHINGBAD") |
3319 | + self.assertEqual(thermal_zones[0].temperature_value, None) |
3320 | + self.assertEqual(thermal_zones[0].temperature_unit, None) |
3321 | |
3322 | def test_temperature_file_with_missing_label(self): |
3323 | self.write_thermal_zone("THM0", "SOMETHINGBAD") |
3324 | @@ -190,7 +191,7 @@ |
3325 | file.write("bad-label: foo bar\n") |
3326 | file.close() |
3327 | thermal_zones = self.get_thermal_zones() |
3328 | - self.assertEquals(len(thermal_zones), 1) |
3329 | - self.assertEquals(thermal_zones[0].temperature, None) |
3330 | - self.assertEquals(thermal_zones[0].temperature_value, None) |
3331 | - self.assertEquals(thermal_zones[0].temperature_unit, None) |
3332 | + self.assertEqual(len(thermal_zones), 1) |
3333 | + self.assertEqual(thermal_zones[0].temperature, None) |
3334 | + self.assertEqual(thermal_zones[0].temperature_value, None) |
3335 | + self.assertEqual(thermal_zones[0].temperature_unit, None) |
3336 | |
3337 | === modified file 'landscape/lib/tests/test_timestamp.py' |
3338 | --- landscape/lib/tests/test_timestamp.py 2008-06-10 10:56:01 +0000 |
3339 | +++ landscape/lib/tests/test_timestamp.py 2011-07-06 21:14:28 +0000 |
3340 | @@ -12,9 +12,9 @@ |
3341 | date = datetime.utcfromtimestamp(1000) |
3342 | timestamp = to_timestamp(date) |
3343 | self.assertTrue(isinstance(timestamp, int)) |
3344 | - self.assertEquals(timestamp, 1000) |
3345 | + self.assertEqual(timestamp, 1000) |
3346 | |
3347 | def test_before_epoch_conversion(self): |
3348 | """Test converting a date before the epoch.""" |
3349 | date = datetime.utcfromtimestamp(-1000) |
3350 | - self.assertEquals(to_timestamp(date), -1000) |
3351 | + self.assertEqual(to_timestamp(date), -1000) |
3352 | |
3353 | === modified file 'landscape/lib/tests/test_warning.py' |
3354 | --- landscape/lib/tests/test_warning.py 2009-04-09 14:48:58 +0000 |
3355 | +++ landscape/lib/tests/test_warning.py 2011-07-06 21:14:28 +0000 |
3356 | @@ -20,8 +20,8 @@ |
3357 | |
3358 | # Warning filters are processed beginning to end, and the first filter |
3359 | # which matches a particular warning is used. |
3360 | - |
3361 | - self.assertEquals( |
3362 | + |
3363 | + self.assertEqual( |
3364 | filters, |
3365 | # The frontmost should "default" (i.e. print) on UserWarnings |
3366 | [("default", None, UserWarning, None, 0), |
3367 | |
3368 | === modified file 'landscape/manager/tests/test_config.py' |
3369 | --- landscape/manager/tests/test_config.py 2011-04-14 09:58:34 +0000 |
3370 | +++ landscape/manager/tests/test_config.py 2011-07-06 21:14:28 +0000 |
3371 | @@ -22,7 +22,7 @@ |
3372 | which plugins should be active. |
3373 | """ |
3374 | self.config.load(["--manager-plugins", "ProcessKiller"]) |
3375 | - self.assertEquals(self.config.plugin_factories, ["ProcessKiller"]) |
3376 | + self.assertEqual(self.config.plugin_factories, ["ProcessKiller"]) |
3377 | |
3378 | def test_include_script_execution(self): |
3379 | """ |
3380 | @@ -30,15 +30,15 @@ |
3381 | command line option. |
3382 | """ |
3383 | self.config.load(["--include-manager-plugins", "ScriptExecution"]) |
3384 | - self.assertEquals(len(self.config.plugin_factories), |
3385 | - len(ALL_PLUGINS) + 1) |
3386 | + self.assertEqual(len(self.config.plugin_factories), |
3387 | + len(ALL_PLUGINS) + 1) |
3388 | self.assertTrue('ScriptExecution' in self.config.plugin_factories) |
3389 | |
3390 | def test_get_allowed_script_users(self): |
3391 | """ |
3392 | If no script users are specified, the default is 'nobody'. |
3393 | """ |
3394 | - self.assertEquals(self.config.get_allowed_script_users(), ["nobody"]) |
3395 | + self.assertEqual(self.config.get_allowed_script_users(), ["nobody"]) |
3396 | |
3397 | def test_get_allowed_script_users_all(self): |
3398 | """ |
3399 | @@ -54,5 +54,5 @@ |
3400 | as. |
3401 | """ |
3402 | self.config.load(["--script-users", "foo, bar,baz"]) |
3403 | - self.assertEquals(self.config.get_allowed_script_users(), |
3404 | - ["foo", "bar", "baz"]) |
3405 | + self.assertEqual(self.config.get_allowed_script_users(), |
3406 | + ["foo", "bar", "baz"]) |
3407 | |
3408 | === modified file 'landscape/manager/tests/test_customgraph.py' |
3409 | --- landscape/manager/tests/test_customgraph.py 2010-06-22 10:51:24 +0000 |
3410 | +++ landscape/manager/tests/test_customgraph.py 2011-07-06 21:14:28 +0000 |
3411 | @@ -49,7 +49,7 @@ |
3412 | "username": username, |
3413 | "graph-id": 123}) |
3414 | |
3415 | - self.assertEquals( |
3416 | + self.assertEqual( |
3417 | self.store.get_graphs(), |
3418 | [(123, |
3419 | os.path.join(self.data_path, "custom-graph-scripts", |
3420 | @@ -77,8 +77,8 @@ |
3421 | "username": "foo", |
3422 | "graph-id": 123}) |
3423 | graph = self.store.get_graph(123) |
3424 | - self.assertEquals(graph[0], 123) |
3425 | - self.assertEquals(graph[2], u"foo") |
3426 | + self.assertEqual(graph[0], 123) |
3427 | + self.assertEqual(graph[2], u"foo") |
3428 | self.assertTrue(error_message in self.logfile.getvalue()) |
3429 | |
3430 | def test_add_graph_for_user(self): |
3431 | @@ -103,7 +103,7 @@ |
3432 | "code": "echo hi!", |
3433 | "username": "bar", |
3434 | "graph-id": 123}) |
3435 | - self.assertEquals( |
3436 | + self.assertEqual( |
3437 | self.store.get_graphs(), |
3438 | [(123, os.path.join(self.data_path, "custom-graph-scripts", |
3439 | "graph-123"), |
3440 | @@ -176,7 +176,6 @@ |
3441 | "type": "custom-graph"}]) |
3442 | return self.graph_manager.run().addCallback(check) |
3443 | |
3444 | - |
3445 | def test_run_with_nonzero_exit_code(self): |
3446 | filename = self.makeFile() |
3447 | tempfile = file(filename, "w") |
3448 | @@ -184,6 +183,7 @@ |
3449 | tempfile.close() |
3450 | os.chmod(filename, 0777) |
3451 | self.store.add_graph(123, filename, None) |
3452 | + |
3453 | def check(ignore): |
3454 | self.graph_manager.exchange() |
3455 | self.assertMessages( |
3456 | @@ -204,9 +204,9 @@ |
3457 | self.graph_manager.process_factory = factory |
3458 | result = self.graph_manager.run() |
3459 | |
3460 | - self.assertEquals(len(factory.spawns), 1) |
3461 | + self.assertEqual(len(factory.spawns), 1) |
3462 | spawn = factory.spawns[0] |
3463 | - self.assertEquals(spawn[1], filename) |
3464 | + self.assertEqual(spawn[1], filename) |
3465 | |
3466 | self._exit_process_protocol(spawn[0], "foobar") |
3467 | |
3468 | @@ -230,9 +230,9 @@ |
3469 | self.graph_manager.process_factory = factory |
3470 | result = self.graph_manager.run() |
3471 | |
3472 | - self.assertEquals(len(factory.spawns), 1) |
3473 | + self.assertEqual(len(factory.spawns), 1) |
3474 | spawn = factory.spawns[0] |
3475 | - self.assertEquals(spawn[1], filename) |
3476 | + self.assertEqual(spawn[1], filename) |
3477 | |
3478 | self._exit_process_protocol(spawn[0], "") |
3479 | |
3480 | @@ -257,7 +257,7 @@ |
3481 | self.graph_manager.process_factory = factory |
3482 | result = self.graph_manager.run() |
3483 | |
3484 | - self.assertEquals(len(factory.spawns), 2) |
3485 | + self.assertEqual(len(factory.spawns), 2) |
3486 | spawn = factory.spawns[0] |
3487 | self._exit_process_protocol(spawn[0], "") |
3488 | spawn = factory.spawns[1] |
3489 | @@ -287,7 +287,7 @@ |
3490 | self.graph_manager.process_factory = factory |
3491 | result = self.graph_manager.run() |
3492 | |
3493 | - self.assertEquals(len(factory.spawns), 2) |
3494 | + self.assertEqual(len(factory.spawns), 2) |
3495 | spawn = factory.spawns[0] |
3496 | self._exit_process_protocol(spawn[0], "foo") |
3497 | spawn = factory.spawns[1] |
3498 | @@ -316,6 +316,7 @@ |
3499 | self.graph_manager.process_factory = factory |
3500 | |
3501 | mock_getpwnam = self.mocker.replace("pwd.getpwnam", passthrough=False) |
3502 | + |
3503 | class pwnam(object): |
3504 | pw_uid = 1234 |
3505 | pw_gid = 5678 |
3506 | @@ -326,14 +327,14 @@ |
3507 | |
3508 | result = self.graph_manager.run() |
3509 | |
3510 | - self.assertEquals(len(factory.spawns), 1) |
3511 | + self.assertEqual(len(factory.spawns), 1) |
3512 | spawn = factory.spawns[0] |
3513 | - self.assertEquals(spawn[1], filename) |
3514 | - self.assertEquals(spawn[2], ()) |
3515 | - self.assertEquals(spawn[3], {}) |
3516 | - self.assertEquals(spawn[4], "/") |
3517 | - self.assertEquals(spawn[5], 1234) |
3518 | - self.assertEquals(spawn[6], 5678) |
3519 | + self.assertEqual(spawn[1], filename) |
3520 | + self.assertEqual(spawn[2], ()) |
3521 | + self.assertEqual(spawn[3], {}) |
3522 | + self.assertEqual(spawn[4], "/") |
3523 | + self.assertEqual(spawn[5], 1234) |
3524 | + self.assertEqual(spawn[6], 5678) |
3525 | |
3526 | self._exit_process_protocol(spawn[0], "spam") |
3527 | |
3528 | @@ -350,7 +351,7 @@ |
3529 | self.graph_manager.process_factory = factory |
3530 | result = self.graph_manager.run() |
3531 | |
3532 | - self.assertEquals(len(factory.spawns), 0) |
3533 | + self.assertEqual(len(factory.spawns), 0) |
3534 | |
3535 | def check(ignore): |
3536 | self.graph_manager.exchange() |
3537 | @@ -379,7 +380,7 @@ |
3538 | self.graph_manager.process_factory = factory |
3539 | result = self.graph_manager.run() |
3540 | |
3541 | - self.assertEquals(len(factory.spawns), 0) |
3542 | + self.assertEqual(len(factory.spawns), 0) |
3543 | |
3544 | def check(ignore): |
3545 | self.graph_manager.exchange() |
3546 | @@ -400,11 +401,11 @@ |
3547 | self.graph_manager.process_factory = factory |
3548 | result = self.graph_manager.run() |
3549 | |
3550 | - self.assertEquals(len(factory.spawns), 1) |
3551 | + self.assertEqual(len(factory.spawns), 1) |
3552 | spawn = factory.spawns[0] |
3553 | protocol = spawn[0] |
3554 | protocol.makeConnection(DummyProcess()) |
3555 | - self.assertEquals(spawn[1], filename) |
3556 | + self.assertEqual(spawn[1], filename) |
3557 | |
3558 | self.manager.reactor.advance(110) |
3559 | protocol.processEnded(Failure(ProcessDone(0))) |
3560 | @@ -432,7 +433,7 @@ |
3561 | self.graph_manager.process_factory = factory |
3562 | self.graph_manager.run() |
3563 | |
3564 | - self.assertEquals(len(factory.spawns), 0) |
3565 | + self.assertEqual(len(factory.spawns), 0) |
3566 | |
3567 | self.graph_manager.exchange() |
3568 | self.assertMessages( |
3569 | @@ -500,7 +501,7 @@ |
3570 | "username": username, |
3571 | "graph-id": 123}) |
3572 | self.graph_manager.exchange() |
3573 | - self.graph_manager._get_script_hash = lambda x: 1/0 |
3574 | + self.graph_manager._get_script_hash = lambda x: 1 / 0 |
3575 | self.graph_manager.do_send = True |
3576 | self.graph_manager.exchange() |
3577 | self.assertMessages( |
3578 | @@ -572,7 +573,7 @@ |
3579 | self.graph_manager.process_factory = factory |
3580 | result = self.graph_manager.run() |
3581 | |
3582 | - self.assertEquals(len(factory.spawns), 1) |
3583 | + self.assertEqual(len(factory.spawns), 1) |
3584 | spawn = factory.spawns[0] |
3585 | |
3586 | self.manager.dispatch_message( |
3587 | @@ -617,7 +618,7 @@ |
3588 | self.graph_manager.process_factory = factory |
3589 | result = self.graph_manager.run() |
3590 | |
3591 | - self.assertEquals(len(factory.spawns), 1) |
3592 | + self.assertEqual(len(factory.spawns), 1) |
3593 | spawn = factory.spawns[0] |
3594 | |
3595 | self.manager.dispatch_message( |
3596 | @@ -655,7 +656,7 @@ |
3597 | self.graph_manager.process_factory = factory |
3598 | result = self.graph_manager.run() |
3599 | |
3600 | - self.assertEquals(len(factory.spawns), 0) |
3601 | + self.assertEqual(len(factory.spawns), 0) |
3602 | |
3603 | return result.addCallback(self.assertIdentical, None) |
3604 | |
3605 | @@ -666,14 +667,14 @@ |
3606 | of results. |
3607 | """ |
3608 | self.graph_manager.registry.broker.call_if_accepted = ( |
3609 | - lambda *args: 1/0) |
3610 | + lambda *args: 1 / 0) |
3611 | factory = StubProcessFactory() |
3612 | self.graph_manager.process_factory = factory |
3613 | result = self.graph_manager.run() |
3614 | |
3615 | - self.assertEquals(len(factory.spawns), 0) |
3616 | + self.assertEqual(len(factory.spawns), 0) |
3617 | |
3618 | - return result.addCallback(self.assertEquals, []) |
3619 | + return result.addCallback(self.assertEqual, []) |
3620 | |
3621 | def test_run_unknown_user_with_unicode(self): |
3622 | """ |
3623 | @@ -690,7 +691,7 @@ |
3624 | self.graph_manager.process_factory = factory |
3625 | result = self.graph_manager.run() |
3626 | |
3627 | - self.assertEquals(len(factory.spawns), 0) |
3628 | + self.assertEqual(len(factory.spawns), 0) |
3629 | |
3630 | def check(ignore): |
3631 | self.graph_manager.exchange() |
3632 | |
3633 | === modified file 'landscape/manager/tests/test_packagemanager.py' |
3634 | --- landscape/manager/tests/test_packagemanager.py 2010-04-26 07:38:03 +0000 |
3635 | +++ landscape/manager/tests/test_packagemanager.py 2011-07-06 21:14:28 +0000 |
3636 | @@ -104,7 +104,7 @@ |
3637 | |
3638 | package_manager_mock = self.mocker.patch(self.package_manager) |
3639 | package_manager_mock.spawn_handler(PackageChanger) |
3640 | - self.mocker.count(2) # Once for registration, then again explicitly. |
3641 | + self.mocker.count(2) # Once for registration, then again explicitly. |
3642 | self.mocker.replay() |
3643 | |
3644 | self.manager.add(self.package_manager) |
3645 | @@ -121,7 +121,7 @@ |
3646 | |
3647 | package_manager_mock = self.mocker.patch(self.package_manager) |
3648 | package_manager_mock.spawn_handler(PackageChanger) |
3649 | - self.mocker.count(2) # Once for registration, then again explicitly. |
3650 | + self.mocker.count(2) # Once for registration, then again explicitly. |
3651 | self.mocker.replay() |
3652 | |
3653 | self.manager.add(self.package_manager) |
3654 | @@ -137,7 +137,7 @@ |
3655 | |
3656 | package_manager_mock = self.mocker.patch(self.package_manager) |
3657 | package_manager_mock.spawn_handler(ReleaseUpgrader) |
3658 | - self.mocker.count(2) # Once for registration, then again explicitly. |
3659 | + self.mocker.count(2) # Once for registration, then again explicitly. |
3660 | self.mocker.replay() |
3661 | |
3662 | self.manager.add(self.package_manager) |
3663 | @@ -154,7 +154,7 @@ |
3664 | self.manager.dispatch_message(message) |
3665 | task = self.package_store.get_next_task("changer") |
3666 | self.assertTrue(task) |
3667 | - self.assertEquals(task.data, message) |
3668 | + self.assertEqual(task.data, message) |
3669 | |
3670 | def test_release_upgrade_handling(self): |
3671 | """ |
3672 | @@ -172,7 +172,7 @@ |
3673 | self.manager.dispatch_message(message) |
3674 | task = self.package_store.get_next_task("release-upgrader") |
3675 | self.assertTrue(task) |
3676 | - self.assertEquals(task.data, message) |
3677 | + self.assertEqual(task.data, message) |
3678 | |
3679 | def test_spawn_changer(self): |
3680 | """ |
3681 | @@ -341,4 +341,4 @@ |
3682 | self.manager.dispatch_message(message) |
3683 | task = self.package_store.get_next_task("changer") |
3684 | self.assertTrue(task) |
3685 | - self.assertEquals(task.data, message) |
3686 | + self.assertEqual(task.data, message) |
3687 | |
3688 | === modified file 'landscape/manager/tests/test_processkiller.py' |
3689 | --- landscape/manager/tests/test_processkiller.py 2010-04-26 15:19:55 +0000 |
3690 | +++ landscape/manager/tests/test_processkiller.py 2011-07-06 21:14:28 +0000 |
3691 | @@ -100,7 +100,7 @@ |
3692 | # a signal. |
3693 | self.assertTrue(return_code < 0) |
3694 | process_info = process_info_factory.get_process_info(popen.pid) |
3695 | - self.assertEquals(process_info, None) |
3696 | + self.assertEqual(process_info, None) |
3697 | |
3698 | service = self.broker_service |
3699 | self.assertMessages(service.message_store.get_pending_messages(), |
3700 | |
3701 | === modified file 'landscape/manager/tests/test_scriptexecution.py' |
3702 | --- landscape/manager/tests/test_scriptexecution.py 2010-04-26 14:10:43 +0000 |
3703 | +++ landscape/manager/tests/test_scriptexecution.py 2011-07-06 21:14:28 +0000 |
3704 | @@ -42,13 +42,13 @@ |
3705 | commands. |
3706 | """ |
3707 | result = self.plugin.run_script("/bin/sh", "echo hi") |
3708 | - result.addCallback(self.assertEquals, "hi\n") |
3709 | + result.addCallback(self.assertEqual, "hi\n") |
3710 | return result |
3711 | |
3712 | def test_other_interpreter(self): |
3713 | """Non-shell interpreters can be specified.""" |
3714 | result = self.plugin.run_script("/usr/bin/python", "print 'hi'") |
3715 | - result.addCallback(self.assertEquals, "hi\n") |
3716 | + result.addCallback(self.assertEqual, "hi\n") |
3717 | return result |
3718 | |
3719 | def test_other_interpreter_env(self): |
3720 | @@ -78,8 +78,8 @@ |
3721 | # run_script is truly async |
3722 | d1 = self.plugin.run_script("/bin/sh", "cat " + fifo) |
3723 | d2 = self.plugin.run_script("/bin/sh", "echo hi > " + fifo) |
3724 | - d1.addCallback(self.assertEquals, "hi\n") |
3725 | - d2.addCallback(self.assertEquals, "") |
3726 | + d1.addCallback(self.assertEqual, "hi\n") |
3727 | + d2.addCallback(self.assertEqual, "") |
3728 | return gatherResults([d1, d2]) |
3729 | |
3730 | def test_accented_run_in_code(self): |
3731 | @@ -91,7 +91,7 @@ |
3732 | result = self.plugin.run_script( |
3733 | u"/bin/sh", u"echo %s" % (accented_content,)) |
3734 | result.addCallback( |
3735 | - self.assertEquals, "%s\n" % (accented_content.encode("utf-8"),)) |
3736 | + self.assertEqual, "%s\n" % (accented_content.encode("utf-8"),)) |
3737 | return result |
3738 | |
3739 | def test_accented_run_in_interpreter(self): |
3740 | @@ -119,7 +119,7 @@ |
3741 | mock_umask(0077) |
3742 | self.mocker.replay() |
3743 | result = self.plugin.run_script("/bin/sh", "umask") |
3744 | - result.addCallback(self.assertEquals, "0022\n") |
3745 | + result.addCallback(self.assertEqual, "0022\n") |
3746 | return result |
3747 | |
3748 | def test_restore_umask_in_event_of_error(self): |
3749 | @@ -147,7 +147,7 @@ |
3750 | attachments={u"file1": "some data"}) |
3751 | |
3752 | def check(result): |
3753 | - self.assertEquals(result, "file1\nsome data") |
3754 | + self.assertEqual(result, "file1\nsome data") |
3755 | result.addCallback(check) |
3756 | return result |
3757 | |
3758 | @@ -157,7 +157,7 @@ |
3759 | execution plugin tries to remove the script file. |
3760 | """ |
3761 | result = self.plugin.run_script("/bin/sh", "echo hi && rm $0") |
3762 | - result.addCallback(self.assertEquals, "hi\n") |
3763 | + result.addCallback(self.assertEqual, "hi\n") |
3764 | return result |
3765 | |
3766 | def test_self_remove_attachments(self): |
3767 | @@ -171,7 +171,7 @@ |
3768 | attachments={u"file1": "some data"}) |
3769 | |
3770 | def check(result): |
3771 | - self.assertEquals(result, "file1\n") |
3772 | + self.assertEqual(result, "file1\n") |
3773 | result.addCallback(check) |
3774 | return result |
3775 | |
3776 | @@ -187,12 +187,12 @@ |
3777 | |
3778 | result = self.plugin.run_script("/bin/sh", "echo hi", user=username) |
3779 | |
3780 | - self.assertEquals(len(factory.spawns), 1) |
3781 | + self.assertEqual(len(factory.spawns), 1) |
3782 | spawn = factory.spawns[0] |
3783 | - self.assertEquals(spawn[4], path) |
3784 | - self.assertEquals(spawn[5], uid) |
3785 | - self.assertEquals(spawn[6], gid) |
3786 | - result.addCallback(self.assertEquals, "foobar") |
3787 | + self.assertEqual(spawn[4], path) |
3788 | + self.assertEqual(spawn[5], uid) |
3789 | + self.assertEqual(spawn[6], gid) |
3790 | + result.addCallback(self.assertEqual, "foobar") |
3791 | |
3792 | protocol = spawn[0] |
3793 | protocol.childDataReceived(1, "foobar") |
3794 | @@ -250,13 +250,13 @@ |
3795 | result = self.plugin.run_script("/bin/sh", "echo hi", user=username, |
3796 | attachments={u"file 1": "some data"}) |
3797 | |
3798 | - self.assertEquals(len(factory.spawns), 1) |
3799 | + self.assertEqual(len(factory.spawns), 1) |
3800 | spawn = factory.spawns[0] |
3801 | self.assertIn("LANDSCAPE_ATTACHMENTS", spawn[3].keys()) |
3802 | attachment_dir = spawn[3]["LANDSCAPE_ATTACHMENTS"] |
3803 | - self.assertEquals(stat.S_IMODE(os.stat(attachment_dir).st_mode), 0700) |
3804 | + self.assertEqual(stat.S_IMODE(os.stat(attachment_dir).st_mode), 0700) |
3805 | filename = os.path.join(attachment_dir, "file 1") |
3806 | - self.assertEquals(stat.S_IMODE(os.stat(filename).st_mode), 0600) |
3807 | + self.assertEqual(stat.S_IMODE(os.stat(filename).st_mode), 0600) |
3808 | |
3809 | protocol = spawn[0] |
3810 | protocol.childDataReceived(1, "foobar") |
3811 | @@ -265,7 +265,7 @@ |
3812 | protocol.processEnded(Failure(ProcessDone(0))) |
3813 | |
3814 | def check(data): |
3815 | - self.assertEquals(data, "foobar") |
3816 | + self.assertEqual(data, "foobar") |
3817 | self.assertFalse(os.path.exists(attachment_dir)) |
3818 | return result.addCallback(check) |
3819 | |
3820 | @@ -275,7 +275,7 @@ |
3821 | self.plugin.process_factory = factory |
3822 | self.plugin.size_limit = 100 |
3823 | result = self.plugin.run_script("/bin/sh", "") |
3824 | - result.addCallback(self.assertEquals, "x" * 100) |
3825 | + result.addCallback(self.assertEqual, "x" * 100) |
3826 | |
3827 | protocol = factory.spawns[0][0] |
3828 | protocol.childDataReceived(1, "x" * 200) |
3829 | @@ -310,7 +310,7 @@ |
3830 | |
3831 | def got_error(f): |
3832 | self.assertTrue(f.check(ProcessTimeLimitReachedError)) |
3833 | - self.assertEquals(f.value.data, "hi\n") |
3834 | + self.assertEqual(f.value.data, "hi\n") |
3835 | result.addErrback(got_error) |
3836 | return result |
3837 | |
3838 | @@ -327,7 +327,7 @@ |
3839 | protocol.childDataReceived(1, "hi\n") |
3840 | protocol.processEnded(Failure(ProcessDone(0))) |
3841 | self.manager.reactor.advance(501) |
3842 | - self.assertEquals(transport.signals, []) |
3843 | + self.assertEqual(transport.signals, []) |
3844 | |
3845 | def test_cancel_doesnt_blow_after_success(self): |
3846 | """ |
3847 | @@ -346,7 +346,7 @@ |
3848 | self.manager.reactor.advance(501) |
3849 | |
3850 | def got_result(output): |
3851 | - self.assertEquals(output, "hi") |
3852 | + self.assertEqual(output, "hi") |
3853 | result.addCallback(got_result) |
3854 | return result |
3855 | |
3856 | @@ -412,7 +412,7 @@ |
3857 | |
3858 | def eb(failure): |
3859 | failure.trap(UnknownInterpreterError) |
3860 | - self.assertEquals( |
3861 | + self.assertEqual( |
3862 | failure.value.interpreter, |
3863 | "/bin/cantpossiblyexist") |
3864 | return d.addCallback(cb).addErrback(eb) |
3865 | @@ -433,7 +433,7 @@ |
3866 | script has the correct content. |
3867 | """ |
3868 | data = open(executable, "r").read() |
3869 | - self.assertEquals(data, "#!%s\n%s" % (interp, code)) |
3870 | + self.assertEqual(data, "#!%s\n%s" % (interp, code)) |
3871 | |
3872 | def _send_script(self, interpreter, code, operation_id=123, |
3873 | user=pwd.getpwuid(os.getuid())[0], |
3874 | @@ -652,7 +652,7 @@ |
3875 | self.assertTrue(self.broker_service.exchanger.is_urgent()) |
3876 | [message] = ( |
3877 | self.broker_service.message_store.get_pending_messages()) |
3878 | - self.assertEquals( |
3879 | + self.assertEqual( |
3880 | message["result-text"], |
3881 | u"\x7fELF\x01\x01\x01\x00\x00\x00\ufffd\x01") |
3882 | |
3883 | |
3884 | === modified file 'landscape/manager/tests/test_service.py' |
3885 | --- landscape/manager/tests/test_service.py 2010-08-11 11:56:29 +0000 |
3886 | +++ landscape/manager/tests/test_service.py 2011-07-06 21:14:28 +0000 |
3887 | @@ -26,7 +26,7 @@ |
3888 | By default the L{ManagerService.plugins} list holds an instance of |
3889 | every enabled manager plugin. |
3890 | """ |
3891 | - self.assertEquals(len(self.service.plugins), len(ALL_PLUGINS)) |
3892 | + self.assertEqual(len(self.service.plugins), len(ALL_PLUGINS)) |
3893 | |
3894 | def test_get_plugins(self): |
3895 | """ |
3896 | @@ -59,7 +59,7 @@ |
3897 | self.broker_service.port.stopListening() |
3898 | |
3899 | def assert_broker_connection(ignored): |
3900 | - self.assertEquals(len(self.broker_service.broker.get_clients()), 1) |
3901 | + self.assertEqual(len(self.broker_service.broker.get_clients()), 1) |
3902 | self.assertIs(self.service.broker, self.service.manager.broker) |
3903 | result = self.service.broker.ping() |
3904 | return result.addCallback(stop_service) |
3905 | |
3906 | === modified file 'landscape/manager/tests/test_shutdownmanager.py' |
3907 | --- landscape/manager/tests/test_shutdownmanager.py 2010-04-23 13:39:22 +0000 |
3908 | +++ landscape/manager/tests/test_shutdownmanager.py 2011-07-06 21:14:28 +0000 |
3909 | @@ -34,14 +34,14 @@ |
3910 | [arguments] = self.process_factory.spawns |
3911 | protocol = arguments[0] |
3912 | self.assertTrue(isinstance(protocol, ShutdownProcessProtocol)) |
3913 | - self.assertEquals( |
3914 | + self.assertEqual( |
3915 | arguments[1:3], |
3916 | ("/sbin/shutdown", ["/sbin/shutdown", "-r", "+4", |
3917 | "Landscape is rebooting the system"])) |
3918 | |
3919 | def restart_performed(ignore): |
3920 | self.assertTrue(self.broker_service.exchanger.is_urgent()) |
3921 | - self.assertEquals( |
3922 | + self.assertEqual( |
3923 | self.broker_service.message_store.get_pending_messages(), |
3924 | [{"type": "operation-result", "api": SERVER_API, |
3925 | "operation-id": 100, "timestamp": 10, "status": SUCCEEDED, |
3926 | @@ -65,7 +65,7 @@ |
3927 | message = {"type": "shutdown", "reboot": False, "operation-id": 100} |
3928 | self.plugin.perform_shutdown(message) |
3929 | [arguments] = self.process_factory.spawns |
3930 | - self.assertEquals( |
3931 | + self.assertEqual( |
3932 | arguments[1:3], |
3933 | ("/sbin/shutdown", ["/sbin/shutdown", "-h", "+4", |
3934 | "Landscape is shutting down the system"])) |
3935 | @@ -81,7 +81,7 @@ |
3936 | |
3937 | def restart_failed(message_id): |
3938 | self.assertTrue(self.broker_service.exchanger.is_urgent()) |
3939 | - self.assertEquals( |
3940 | + self.assertEqual( |
3941 | self.broker_service.message_store.get_pending_messages(), |
3942 | [{"type": "operation-result", "api": SERVER_API, |
3943 | "operation-id": 100, "timestamp": 0, "status": FAILED, |
3944 | @@ -105,7 +105,7 @@ |
3945 | stash = [] |
3946 | |
3947 | def restart_performed(ignore): |
3948 | - self.assertEquals(stash, []) |
3949 | + self.assertEqual(stash, []) |
3950 | stash.append(True) |
3951 | |
3952 | [arguments] = self.process_factory.spawns |
3953 | @@ -128,6 +128,6 @@ |
3954 | protocol.childDataReceived(0, "Data may arrive ") |
3955 | protocol.childDataReceived(0, "in batches.") |
3956 | self.manager.reactor.advance(10) |
3957 | - self.assertEquals(protocol.get_data(), "Data may arrive in batches.") |
3958 | + self.assertEqual(protocol.get_data(), "Data may arrive in batches.") |
3959 | protocol.childDataReceived(0, "Even when you least expect it.") |
3960 | - self.assertEquals(protocol.get_data(), "Data may arrive in batches.") |
3961 | + self.assertEqual(protocol.get_data(), "Data may arrive in batches.") |
3962 | |
3963 | === modified file 'landscape/manager/tests/test_store.py' |
3964 | --- landscape/manager/tests/test_store.py 2008-10-22 16:54:38 +0000 |
3965 | +++ landscape/manager/tests/test_store.py 2011-07-06 21:14:28 +0000 |
3966 | @@ -18,36 +18,36 @@ |
3967 | |
3968 | def test_get_graph(self): |
3969 | graph = self.store.get_graph(1) |
3970 | - self.assertEquals(graph, (1, u"file 1", u"user1")) |
3971 | + self.assertEqual(graph, (1, u"file 1", u"user1")) |
3972 | |
3973 | def test_get_graphs(self): |
3974 | graphs = self.store.get_graphs() |
3975 | - self.assertEquals(graphs, [(1, u"file 1", u"user1")]) |
3976 | + self.assertEqual(graphs, [(1, u"file 1", u"user1")]) |
3977 | |
3978 | def test_get_no_graphs(self): |
3979 | self.store.remove_graph(1) |
3980 | graphs = self.store.get_graphs() |
3981 | - self.assertEquals(graphs, []) |
3982 | + self.assertEqual(graphs, []) |
3983 | |
3984 | def test_add_graph(self): |
3985 | self.store.add_graph(2, u"file 2", u"user2") |
3986 | graph = self.store.get_graph(2) |
3987 | - self.assertEquals(graph, (2, u"file 2", u"user2")) |
3988 | + self.assertEqual(graph, (2, u"file 2", u"user2")) |
3989 | |
3990 | def test_add_update_graph(self): |
3991 | self.store.add_graph(1, u"file 2", u"user2") |
3992 | graph = self.store.get_graph(1) |
3993 | - self.assertEquals(graph, (1, u"file 2", u"user2")) |
3994 | + self.assertEqual(graph, (1, u"file 2", u"user2")) |
3995 | |
3996 | def test_remove_graph(self): |
3997 | self.store.remove_graph(1) |
3998 | graphs = self.store.get_graphs() |
3999 | - self.assertEquals(graphs, []) |
4000 | + self.assertEqual(graphs, []) |
4001 | |
4002 | def test_remove_unknown_graph(self): |
4003 | self.store.remove_graph(2) |
4004 | graphs = self.store.get_graphs() |
4005 | - self.assertEquals(graphs, [(1, u"file 1", u"user1")]) |
4006 | + self.assertEqual(graphs, [(1, u"file 1", u"user1")]) |
4007 | |
4008 | def test_get_accumulate_unknown_graph(self): |
4009 | accumulate = self.store.get_graph_accumulate(2) |
4010 | @@ -56,9 +56,9 @@ |
4011 | def test_set_accumulate_graph(self): |
4012 | self.store.set_graph_accumulate(2, 1234, 2.0) |
4013 | accumulate = self.store.get_graph_accumulate(2) |
4014 | - self.assertEquals(accumulate, (2, 1234, 2.0)) |
4015 | + self.assertEqual(accumulate, (2, 1234, 2.0)) |
4016 | |
4017 | def test_update_accumulate_graph(self): |
4018 | self.store.set_graph_accumulate(1, 4567, 2.0) |
4019 | accumulate = self.store.get_graph_accumulate(1) |
4020 | - self.assertEquals(accumulate, (1, 4567, 2.0)) |
4021 | + self.assertEqual(accumulate, (1, 4567, 2.0)) |
4022 | |
4023 | === modified file 'landscape/manager/tests/test_usermanager.py' |
4024 | --- landscape/manager/tests/test_usermanager.py 2010-09-09 17:01:02 +0000 |
4025 | +++ landscape/manager/tests/test_usermanager.py 2011-07-06 21:14:28 +0000 |
4026 | @@ -125,7 +125,7 @@ |
4027 | def handle_callback2(result, messages): |
4028 | message_store = self.broker_service.message_store |
4029 | new_messages = message_store.get_pending_messages() |
4030 | - self.assertEquals(messages, new_messages) |
4031 | + self.assertEqual(messages, new_messages) |
4032 | return result |
4033 | |
4034 | plugin = self.setup_environment([], [], None) |
4035 | @@ -148,7 +148,7 @@ |
4036 | |
4037 | def handle_callback(result): |
4038 | messages = self.broker_service.message_store.get_pending_messages() |
4039 | - self.assertEquals(len(messages), 3) |
4040 | + self.assertEqual(len(messages), 3) |
4041 | messages = [messages[0], messages[2]] |
4042 | self.assertMessages(messages, |
4043 | [{"type": "users", |
4044 | @@ -190,7 +190,7 @@ |
4045 | |
4046 | def handle_callback(result): |
4047 | messages = self.broker_service.message_store.get_pending_messages() |
4048 | - self.assertEquals(len(messages), 3) |
4049 | + self.assertEqual(len(messages), 3) |
4050 | # Ignore the message created by plugin.run. |
4051 | self.assertMessages(messages[1:], |
4052 | [{"type": "operation-result", |
4053 | @@ -238,7 +238,7 @@ |
4054 | def handle_callback2(result, messages): |
4055 | mstore = self.broker_service.message_store |
4056 | new_messages = mstore.get_pending_messages() |
4057 | - self.assertEquals(messages, new_messages) |
4058 | + self.assertEqual(messages, new_messages) |
4059 | return result |
4060 | |
4061 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", |
4062 | @@ -262,7 +262,7 @@ |
4063 | |
4064 | def handle_callback(result): |
4065 | messages = self.broker_service.message_store.get_pending_messages() |
4066 | - self.assertEquals(len(messages), 3) |
4067 | + self.assertEqual(len(messages), 3) |
4068 | self.assertMessages([messages[0], messages[2]], |
4069 | [{"type": "users", |
4070 | "create-group-members": {u"users": |
4071 | @@ -311,7 +311,7 @@ |
4072 | |
4073 | def handle_callback(result): |
4074 | messages = self.broker_service.message_store.get_pending_messages() |
4075 | - self.assertEquals(len(messages), 3) |
4076 | + self.assertEqual(len(messages), 3) |
4077 | # Ignore the message created by plugin.run. |
4078 | self.assertMessages([messages[2], messages[1]], |
4079 | [{"timestamp": 0, "delete-users": ["jdoe"], |
4080 | @@ -321,7 +321,6 @@ |
4081 | "operation-id": 39, "timestamp": 0, |
4082 | "result-text": "remove_user succeeded"}]) |
4083 | |
4084 | - |
4085 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/home/bo", |
4086 | "/bin/zsh")] |
4087 | self.setup_environment(users, [], None) |
4088 | @@ -357,7 +356,6 @@ |
4089 | "operation-id": 40, "timestamp": 0, |
4090 | "result-text": "remove_user succeeded"}]) |
4091 | |
4092 | - |
4093 | results = [] |
4094 | results.append(self.manager.dispatch_message({"username": "foo", |
4095 | "delete-home": True, |
4096 | @@ -378,7 +376,7 @@ |
4097 | |
4098 | def handle_callback(result): |
4099 | messages = self.broker_service.message_store.get_pending_messages() |
4100 | - self.assertEquals(len(messages), 1) |
4101 | + self.assertEqual(len(messages), 1) |
4102 | failure_string = "UserManagementError: remove_user failed" |
4103 | self.assertMessages(messages, |
4104 | [{"type": "operation-result", "status": FAILED, |
4105 | @@ -407,7 +405,7 @@ |
4106 | def handle_callback(result): |
4107 | messages = ( |
4108 | self.broker_service.message_store.get_pending_messages()) |
4109 | - self.assertEquals(len(messages), 3) |
4110 | + self.assertEqual(len(messages), 3) |
4111 | # Ignore the message created by plugin.run. |
4112 | self.assertMessages([messages[2], messages[1]], |
4113 | [{"timestamp": 0, "delete-users": ["jdoe"], |
4114 | @@ -446,7 +444,7 @@ |
4115 | def handle_callback2(result, messages): |
4116 | message_store = self.broker_service.message_store |
4117 | new_messages = message_store.get_pending_messages() |
4118 | - self.assertEquals(messages, new_messages) |
4119 | + self.assertEqual(messages, new_messages) |
4120 | |
4121 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/home/bo", |
4122 | "/bin/zsh")] |
4123 | @@ -470,7 +468,7 @@ |
4124 | |
4125 | def handle_callback(result): |
4126 | messages = self.broker_service.message_store.get_pending_messages() |
4127 | - self.assertEquals(len(messages), 3) |
4128 | + self.assertEqual(len(messages), 3) |
4129 | self.assertMessages([messages[0], messages[2]], |
4130 | [{"type": "users", |
4131 | "create-users": [{"home-phone": None, |
4132 | @@ -507,10 +505,11 @@ |
4133 | |
4134 | def handle_callback(result): |
4135 | messages = self.broker_service.message_store.get_pending_messages() |
4136 | - self.assertEquals(len(messages), 3, messages) |
4137 | + self.assertEqual(len(messages), 3, messages) |
4138 | # Ignore the message created by plugin.run. |
4139 | self.assertMessages([messages[2], messages[1]], |
4140 | - [{"timestamp": 0, "type": "users", "operation-id": 99, |
4141 | + [{"timestamp": 0, "type": "users", |
4142 | + "operation-id": 99, |
4143 | "update-users": [{"home-phone": None, |
4144 | "username": "jdoe", |
4145 | "uid": 1000, |
4146 | @@ -524,7 +523,8 @@ |
4147 | "operation-id": 99, "timestamp": 0, |
4148 | "result-text": "lock_user succeeded"}]) |
4149 | |
4150 | - users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/home/bo", "/bin/zsh")] |
4151 | + users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/home/bo", |
4152 | + "/bin/zsh")] |
4153 | self.setup_environment(users, [], self.shadow_file) |
4154 | result = self.manager.dispatch_message( |
4155 | {"username": "jdoe", |
4156 | @@ -543,7 +543,7 @@ |
4157 | |
4158 | def handle_callback(result): |
4159 | messages = self.broker_service.message_store.get_pending_messages() |
4160 | - self.assertEquals(len(messages), 1) |
4161 | + self.assertEqual(len(messages), 1) |
4162 | failure_string = "UserManagementError: lock_user failed" |
4163 | self.assertMessages(messages, |
4164 | [{"type": "operation-result", |
4165 | @@ -577,7 +577,7 @@ |
4166 | def handle_callback2(result, messages): |
4167 | message_store = self.broker_service.message_store |
4168 | new_messages = message_store.get_pending_messages() |
4169 | - self.assertEquals(messages, new_messages) |
4170 | + self.assertEqual(messages, new_messages) |
4171 | |
4172 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/home/bo", |
4173 | "/bin/zsh")] |
4174 | @@ -598,7 +598,7 @@ |
4175 | """ |
4176 | def handle_callback(result): |
4177 | messages = self.broker_service.message_store.get_pending_messages() |
4178 | - self.assertEquals(len(messages), 3) |
4179 | + self.assertEqual(len(messages), 3) |
4180 | self.assertMessages([messages[0], messages[2]], |
4181 | [{"type": "users", |
4182 | "create-users": [{"home-phone": None, |
4183 | @@ -639,10 +639,11 @@ |
4184 | |
4185 | def handle_callback(result): |
4186 | messages = self.broker_service.message_store.get_pending_messages() |
4187 | - self.assertEquals(len(messages), 3) |
4188 | + self.assertEqual(len(messages), 3) |
4189 | # Ignore the message created by plugin.run. |
4190 | self.assertMessages([messages[2], messages[1]], |
4191 | - [{"timestamp": 0, "type": "users", "operation-id": 99, |
4192 | + [{"timestamp": 0, "type": "users", |
4193 | + "operation-id": 99, |
4194 | "update-users": [{"home-phone": None, |
4195 | "username": "psmith", |
4196 | "uid": 1000, |
4197 | @@ -677,7 +678,7 @@ |
4198 | |
4199 | def handle_callback(result): |
4200 | messages = self.broker_service.message_store.get_pending_messages() |
4201 | - self.assertEquals(len(messages), 1) |
4202 | + self.assertEqual(len(messages), 1) |
4203 | failure_string = "UserManagementError: unlock_user failed" |
4204 | self.assertMessages(messages, |
4205 | [{"type": "operation-result", |
4206 | @@ -712,7 +713,7 @@ |
4207 | def handle_callback2(result, messages): |
4208 | message_store = self.broker_service.message_store |
4209 | new_messages = message_store.get_pending_messages() |
4210 | - self.assertEquals(messages, new_messages) |
4211 | + self.assertEqual(messages, new_messages) |
4212 | |
4213 | users = [("psmith", "x", 1000, 1000, "Paul Smith,,,,", "/home/psmith", |
4214 | "/bin/zsh")] |
4215 | @@ -736,7 +737,7 @@ |
4216 | |
4217 | def handle_callback(result): |
4218 | messages = self.broker_service.message_store.get_pending_messages() |
4219 | - self.assertEquals(len(messages), 3) |
4220 | + self.assertEqual(len(messages), 3) |
4221 | self.assertMessages([messages[0], messages[2]], |
4222 | [{"type": "users", |
4223 | "create-users": [{"home-phone": None, |
4224 | @@ -781,7 +782,7 @@ |
4225 | |
4226 | def handle_callback(result): |
4227 | messages = self.broker_service.message_store.get_pending_messages() |
4228 | - self.assertEquals(len(messages), 2) |
4229 | + self.assertEqual(len(messages), 2) |
4230 | # Ignore the message created by plugin.run. |
4231 | self.assertMessages([messages[1], messages[0]], |
4232 | [{"type": "users", "timestamp": 0, |
4233 | @@ -819,7 +820,7 @@ |
4234 | def handle_callback2(result, messages): |
4235 | message_store = self.broker_service.message_store |
4236 | new_messages = message_store.get_pending_messages() |
4237 | - self.assertEquals(messages, new_messages) |
4238 | + self.assertEqual(messages, new_messages) |
4239 | |
4240 | plugin = self.setup_environment([], [], None) |
4241 | result = self.manager.dispatch_message( |
4242 | @@ -829,7 +830,6 @@ |
4243 | result.addCallback(handle_callback1) |
4244 | return result |
4245 | |
4246 | - |
4247 | def test_add_group_event_with_external_changes(self): |
4248 | """ |
4249 | If external user changes have been made but not detected by |
4250 | @@ -840,7 +840,7 @@ |
4251 | |
4252 | def handle_callback(result): |
4253 | messages = self.broker_service.message_store.get_pending_messages() |
4254 | - self.assertEquals(len(messages), 3) |
4255 | + self.assertEqual(len(messages), 3) |
4256 | # We skip the operation-result message. |
4257 | self.assertMessages([messages[0], messages[2]], |
4258 | [{"type": "users", |
4259 | @@ -859,7 +859,6 @@ |
4260 | result.addCallback(handle_callback) |
4261 | return result |
4262 | |
4263 | - |
4264 | def test_edit_group_event(self): |
4265 | """ |
4266 | When an C{edit-group} message is received the specified group |
4267 | @@ -872,25 +871,25 @@ |
4268 | |
4269 | def handle_callback(result): |
4270 | messages = self.broker_service.message_store.get_pending_messages() |
4271 | - self.assertEquals(len(messages), 3) |
4272 | + self.assertEqual(len(messages), 3) |
4273 | # Ignore the message created when the initial snapshot was |
4274 | # taken before the operation was performed. |
4275 | - self.assertMessages(messages, |
4276 | - [{"create-groups": [{"gid": 50, |
4277 | - "name": "sales"}], |
4278 | - "timestamp": 0, |
4279 | - "type": "users"}, |
4280 | - {"type": "operation-result", |
4281 | - "status": SUCCEEDED, |
4282 | - "operation-id": 123, "timestamp": 0, |
4283 | - "result-text": "set_group_details succeeded"}, |
4284 | - {"delete-groups": ["sales"], |
4285 | - "create-groups": [{"gid": 50, |
4286 | - "name": "bizdev"}], |
4287 | - "timestamp": 0, |
4288 | - "operation-id": 123, |
4289 | - "type": "users"},]) |
4290 | - |
4291 | + expected = [{"create-groups": [{"gid": 50, |
4292 | + "name": "sales"}], |
4293 | + "timestamp": 0, |
4294 | + "type": "users"}, |
4295 | + {"type": "operation-result", |
4296 | + "status": SUCCEEDED, |
4297 | + "operation-id": 123, "timestamp": 0, |
4298 | + "result-text": "set_group_details succeeded"}, |
4299 | + {"delete-groups": ["sales"], |
4300 | + "create-groups": [{"gid": 50, |
4301 | + "name": "bizdev"}], |
4302 | + "timestamp": 0, |
4303 | + "operation-id": 123, |
4304 | + "type": "users"}, |
4305 | + ] |
4306 | + self.assertMessages(messages, expected) |
4307 | |
4308 | groups = [("sales", "x", 50, [])] |
4309 | self.setup_environment([], groups, None) |
4310 | @@ -920,7 +919,7 @@ |
4311 | def handle_callback2(result, messages): |
4312 | message_store = self.broker_service.message_store |
4313 | new_messages = message_store.get_pending_messages() |
4314 | - self.assertEquals(messages, new_messages) |
4315 | + self.assertEqual(messages, new_messages) |
4316 | |
4317 | groups = [("sales", "x", 50, [])] |
4318 | plugin = self.setup_environment([], groups, None) |
4319 | @@ -953,7 +952,7 @@ |
4320 | def handle_callback2(result): |
4321 | message_store = self.broker_service.message_store |
4322 | messages = message_store.get_pending_messages() |
4323 | - self.assertEquals(len(messages), 3) |
4324 | + self.assertEqual(len(messages), 3) |
4325 | self.assertMessages([messages[0], messages[2]], |
4326 | [{"type": "users", |
4327 | "create-groups": [{"gid": 1001, |
4328 | @@ -964,14 +963,12 @@ |
4329 | "create-groups": [{"gid": 1001, |
4330 | "name": "webdev"}]}]) |
4331 | |
4332 | - |
4333 | groups = [("sales", "x", 1001, [])] |
4334 | plugin = self.setup_environment([], groups, None) |
4335 | result = plugin.run() |
4336 | result.addCallback(handle_callback1) |
4337 | return result |
4338 | |
4339 | - |
4340 | def test_add_group_member_event(self): |
4341 | """ |
4342 | When an C{add-group-member} message is received the new user |
4343 | @@ -983,19 +980,18 @@ |
4344 | |
4345 | def handle_callback(result): |
4346 | messages = self.broker_service.message_store.get_pending_messages() |
4347 | - self.assertEquals(len(messages), 3) |
4348 | + self.assertEqual(len(messages), 3) |
4349 | # Ignore the message created when the initial snapshot was |
4350 | # taken before the operation was performed. |
4351 | - self.assertMessages([messages[2], messages[1]], |
4352 | - [{"type": "users", "timestamp": 0, |
4353 | - "operation-id": 123, |
4354 | - "create-group-members": {"bizdev": ["jdoe"]}}, |
4355 | - {"type": "operation-result", |
4356 | - "timestamp": 0, |
4357 | - "status": SUCCEEDED, |
4358 | - "operation-id": 123, |
4359 | - "result-text": "add_group_member succeeded"}]) |
4360 | - |
4361 | + expected = [{"type": "users", "timestamp": 0, |
4362 | + "operation-id": 123, |
4363 | + "create-group-members": {"bizdev": ["jdoe"]}}, |
4364 | + {"type": "operation-result", |
4365 | + "timestamp": 0, |
4366 | + "status": SUCCEEDED, |
4367 | + "operation-id": 123, |
4368 | + "result-text": "add_group_member succeeded"}] |
4369 | + self.assertMessages([messages[2], messages[1]], expected) |
4370 | |
4371 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/bin/sh", |
4372 | "/home/jdoe")] |
4373 | @@ -1009,7 +1005,6 @@ |
4374 | result.addCallback(handle_callback) |
4375 | return result |
4376 | |
4377 | - |
4378 | def test_add_group_member_with_username_and_groupname_event(self): |
4379 | """ |
4380 | When an C{add-group-member} message is received with a |
4381 | @@ -1022,17 +1017,16 @@ |
4382 | |
4383 | def handle_callback(result): |
4384 | messages = self.broker_service.message_store.get_pending_messages() |
4385 | - self.assertEquals(len(messages), 3) |
4386 | + self.assertEqual(len(messages), 3) |
4387 | # Ignore the message created when the initial snapshot was |
4388 | # taken before the operation was performed. |
4389 | - self.assertMessages([messages[2], messages[1]], |
4390 | - [{"type": "users", "timestamp": 0, |
4391 | - "operation-id": 123, |
4392 | - "create-group-members": {"bizdev": ["jdoe"]}}, |
4393 | - {"type": "operation-result", "timestamp": 0, |
4394 | - "status": SUCCEEDED, "operation-id": 123, |
4395 | - "result-text": "add_group_member succeeded"}]) |
4396 | - |
4397 | + expected = [{"type": "users", "timestamp": 0, |
4398 | + "operation-id": 123, |
4399 | + "create-group-members": {"bizdev": ["jdoe"]}}, |
4400 | + {"type": "operation-result", "timestamp": 0, |
4401 | + "status": SUCCEEDED, "operation-id": 123, |
4402 | + "result-text": "add_group_member succeeded"}] |
4403 | + self.assertMessages([messages[2], messages[1]], expected) |
4404 | |
4405 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/bin/sh", |
4406 | "/home/jdoe")] |
4407 | @@ -1065,7 +1059,7 @@ |
4408 | def handle_callback2(result, messages): |
4409 | message_store = self.broker_service.message_store |
4410 | new_messages = message_store.get_pending_messages() |
4411 | - self.assertEquals(messages, new_messages) |
4412 | + self.assertEqual(messages, new_messages) |
4413 | |
4414 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/bin/sh", |
4415 | "/home/jdoe")] |
4416 | @@ -1090,21 +1084,21 @@ |
4417 | |
4418 | def handle_callback(result): |
4419 | messages = self.broker_service.message_store.get_pending_messages() |
4420 | - self.assertEquals(len(messages), 3) |
4421 | - self.assertMessages([messages[0], messages[2]], |
4422 | - [{"type": "users", |
4423 | - "create-users": [{"home-phone": None, |
4424 | - "username": "jdoe", |
4425 | - "uid": 1000, |
4426 | - "enabled": True, |
4427 | - "location": None, |
4428 | - "work-phone": None, |
4429 | - "primary-gid": 1000, |
4430 | - "name": "John Doe"}], |
4431 | - "create-groups": [{"gid": 1001, |
4432 | - "name": "bizdev"}]}, |
4433 | - {"type": "users", "operation-id": 123, |
4434 | - "create-group-members": {"bizdev": ["jdoe"]}}]) |
4435 | + self.assertEqual(len(messages), 3) |
4436 | + expected = [{"type": "users", |
4437 | + "create-users": [{"home-phone": None, |
4438 | + "username": "jdoe", |
4439 | + "uid": 1000, |
4440 | + "enabled": True, |
4441 | + "location": None, |
4442 | + "work-phone": None, |
4443 | + "primary-gid": 1000, |
4444 | + "name": "John Doe"}], |
4445 | + "create-groups": [{"gid": 1001, |
4446 | + "name": "bizdev"}]}, |
4447 | + {"type": "users", "operation-id": 123, |
4448 | + "create-group-members": {"bizdev": ["jdoe"]}}] |
4449 | + self.assertMessages([messages[0], messages[2]], expected) |
4450 | |
4451 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/bin/sh", |
4452 | "/home/jdoe")] |
4453 | @@ -1129,9 +1123,10 @@ |
4454 | |
4455 | def handle_callback(result): |
4456 | messages = self.broker_service.message_store.get_pending_messages() |
4457 | - self.assertEquals(len(messages), 3) |
4458 | + self.assertEqual(len(messages), 3) |
4459 | # Ignore the message created by plugin.run. |
4460 | - self.assertMessages([messages[2], messages[1]], |
4461 | + self.assertMessages( |
4462 | + [messages[2], messages[1]], |
4463 | [{"type": "users", "timestamp": 0, |
4464 | "operation-id": 123, |
4465 | "delete-group-members": {"bizdev": ["jdoe"]}}, |
4466 | @@ -1140,7 +1135,6 @@ |
4467 | "operation-id": 123, "timestamp": 0, |
4468 | "result-text": "remove_group_member succeeded"}]) |
4469 | |
4470 | - |
4471 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/bin/sh", |
4472 | "/home/jdoe")] |
4473 | groups = [("bizdev", "x", 1001, ["jdoe"])] |
4474 | @@ -1169,7 +1163,7 @@ |
4475 | def handle_callback2(result, messages): |
4476 | message_store = self.broker_service.message_store |
4477 | new_messages = message_store.get_pending_messages() |
4478 | - self.assertEquals(messages, new_messages) |
4479 | + self.assertEqual(messages, new_messages) |
4480 | |
4481 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/bin/sh", |
4482 | "/home/jdoe")] |
4483 | @@ -1193,22 +1187,22 @@ |
4484 | |
4485 | def handle_callback(result): |
4486 | messages = self.broker_service.message_store.get_pending_messages() |
4487 | - self.assertEquals(len(messages), 3) |
4488 | - self.assertMessages([messages[0], messages[2]], |
4489 | - [{"timestamp": 0, "type": "users", |
4490 | - "create-users": [{"home-phone": None, |
4491 | - "username": "jdoe", |
4492 | - "uid": 1000, |
4493 | - "enabled": True, |
4494 | - "location": None, |
4495 | - "work-phone": None, |
4496 | - "primary-gid": 1000, |
4497 | - "name": "John Doe"}], |
4498 | - "create-groups": [{"gid": 1001, |
4499 | - "name": "bizdev"}], |
4500 | - "create-group-members": {"bizdev": ["jdoe"]}}, |
4501 | - {"type": "users", "operation-id": 123, |
4502 | - "delete-group-members": {"bizdev": ["jdoe"]}}]) |
4503 | + self.assertEqual(len(messages), 3) |
4504 | + expected = [{"timestamp": 0, "type": "users", |
4505 | + "create-users": [{"home-phone": None, |
4506 | + "username": "jdoe", |
4507 | + "uid": 1000, |
4508 | + "enabled": True, |
4509 | + "location": None, |
4510 | + "work-phone": None, |
4511 | + "primary-gid": 1000, |
4512 | + "name": "John Doe"}], |
4513 | + "create-groups": [{"gid": 1001, |
4514 | + "name": "bizdev"}], |
4515 | + "create-group-members": {"bizdev": ["jdoe"]}}, |
4516 | + {"type": "users", "operation-id": 123, |
4517 | + "delete-group-members": {"bizdev": ["jdoe"]}}] |
4518 | + self.assertMessages([messages[0], messages[2]], expected) |
4519 | |
4520 | users = [("jdoe", "x", 1000, 1000, "John Doe,,,,", "/bin/sh", |
4521 | "/home/jdoe")] |
4522 | @@ -1232,7 +1226,6 @@ |
4523 | """ |
4524 | |
4525 | def handle_callback1(result): |
4526 | - |
4527 | result = self.manager.dispatch_message( |
4528 | {"groupname": "sales", "type": "remove-group", |
4529 | "operation-id": 123}) |
4530 | @@ -1243,7 +1236,7 @@ |
4531 | def handle_callback2(result): |
4532 | message_store = self.broker_service.message_store |
4533 | messages = message_store.get_pending_messages() |
4534 | - self.assertEquals(len(messages), 3) |
4535 | + self.assertEqual(len(messages), 3) |
4536 | # Ignore the message created when the initial snapshot was |
4537 | # taken before the operation was performed. |
4538 | self.assertMessages([messages[2], messages[1]], |
4539 | @@ -1280,7 +1273,7 @@ |
4540 | def handle_callback2(result, messages): |
4541 | message_store = self.broker_service.message_store |
4542 | new_messages = message_store.get_pending_messages() |
4543 | - self.assertEquals(messages, new_messages) |
4544 | + self.assertEqual(messages, new_messages) |
4545 | |
4546 | groups = [("sales", "x", 50, [])] |
4547 | plugin = self.setup_environment([], groups, None) |
4548 | @@ -1310,7 +1303,7 @@ |
4549 | def handle_callback2(result): |
4550 | message_store = self.broker_service.message_store |
4551 | messages = message_store.get_pending_messages() |
4552 | - self.assertEquals(len(messages), 3) |
4553 | + self.assertEqual(len(messages), 3) |
4554 | self.assertMessages([messages[0], messages[2]], |
4555 | [{"type": "users", |
4556 | "create-groups": [{"gid": 1001, |
4557 | @@ -1343,7 +1336,7 @@ |
4558 | "psmith:!:13348:0:99999:7:::\n" |
4559 | "yo:$1$q7sz09uw$q.A3526M/SHu8vUb.Jo1A/:13349:0:99999:7:::\n") |
4560 | fd.close() |
4561 | - self.assertEquals(self.user_manager.get_locked_usernames(), ["psmith"]) |
4562 | + self.assertEqual(self.user_manager.get_locked_usernames(), ["psmith"]) |
4563 | |
4564 | def test_get_locked_usernames_with_empty_shadow_file(self): |
4565 | """ |
4566 | @@ -1353,7 +1346,7 @@ |
4567 | fd = open(self.shadow_file, "w") |
4568 | fd.write("\n") |
4569 | fd.close() |
4570 | - self.assertEquals(self.user_manager.get_locked_usernames(), []) |
4571 | + self.assertEqual(self.user_manager.get_locked_usernames(), []) |
4572 | |
4573 | def test_get_locked_usernames_with_non_existing_shadow_file(self): |
4574 | """ |
4575 | @@ -1362,7 +1355,7 @@ |
4576 | """ |
4577 | self.log_helper.ignore_errors("Error reading shadow file.*") |
4578 | self.assertFalse(os.path.exists(self.shadow_file)) |
4579 | - self.assertEquals(self.user_manager.get_locked_usernames(), []) |
4580 | + self.assertEqual(self.user_manager.get_locked_usernames(), []) |
4581 | self.assertIn("Error reading shadow file. [Errno 2] No such file or " |
4582 | "directory", self.logfile.getvalue()) |
4583 | |
4584 | |
4585 | === modified file 'landscape/monitor/tests/test_activeprocessinfo.py' |
4586 | --- landscape/monitor/tests/test_activeprocessinfo.py 2010-04-09 14:43:09 +0000 |
4587 | +++ landscape/monitor/tests/test_activeprocessinfo.py 2011-07-06 21:14:28 +0000 |
4588 | @@ -36,9 +36,9 @@ |
4589 | self.monitor.add(plugin) |
4590 | plugin.exchange() |
4591 | message = self.mstore.get_pending_messages()[0] |
4592 | - self.assertEquals(message["type"], "active-process-info") |
4593 | + self.assertEqual(message["type"], "active-process-info") |
4594 | self.assertTrue("kill-all-processes" in message) |
4595 | - self.assertEquals(message["kill-all-processes"], True) |
4596 | + self.assertEqual(message["kill-all-processes"], True) |
4597 | self.assertTrue("add-processes" in message) |
4598 | |
4599 | def test_only_first_run_includes_kill_message(self): |
4600 | @@ -56,14 +56,14 @@ |
4601 | process_name="blargh") |
4602 | self.monitor.exchange() |
4603 | messages = self.mstore.get_pending_messages() |
4604 | - self.assertEquals(len(messages), 2) |
4605 | + self.assertEqual(len(messages), 2) |
4606 | message = messages[0] |
4607 | - self.assertEquals(message["type"], "active-process-info") |
4608 | + self.assertEqual(message["type"], "active-process-info") |
4609 | self.assertTrue("kill-all-processes" in message) |
4610 | self.assertTrue("add-processes" in message) |
4611 | |
4612 | message = messages[1] |
4613 | - self.assertEquals(message["type"], "active-process-info") |
4614 | + self.assertEqual(message["type"], "active-process-info") |
4615 | self.assertTrue("add-processes" in message) |
4616 | |
4617 | def test_terminating_process_race(self): |
4618 | @@ -113,7 +113,7 @@ |
4619 | self.monitor.add(plugin) |
4620 | plugin.exchange() |
4621 | message = self.mstore.get_pending_messages()[0] |
4622 | - self.assertEquals(message["type"], "active-process-info") |
4623 | + self.assertEqual(message["type"], "active-process-info") |
4624 | self.assertTrue("kill-all-processes" in message) |
4625 | self.assertTrue("add-processes" in message) |
4626 | expected_process_0 = {"state": "R", "gid": 0, "pid": 1, |
4627 | @@ -127,8 +127,8 @@ |
4628 | "start-time": 112, "percent-cpu": 0.0} |
4629 | processes = message["add-processes"] |
4630 | processes.sort(key=operator.itemgetter("pid")) |
4631 | - self.assertEquals(processes, [expected_process_0, expected_process_1, |
4632 | - expected_process_2]) |
4633 | + self.assertEqual(processes, [expected_process_0, expected_process_1, |
4634 | + expected_process_2]) |
4635 | |
4636 | def test_skip_non_numeric_subdirs(self): |
4637 | """Test ensures the plugin doesn't touch non-process dirs in /proc.""" |
4638 | @@ -144,14 +144,14 @@ |
4639 | self.monitor.add(plugin) |
4640 | plugin.exchange() |
4641 | message = self.mstore.get_pending_messages()[0] |
4642 | - self.assertEquals(message["type"], "active-process-info") |
4643 | + self.assertEqual(message["type"], "active-process-info") |
4644 | self.assertTrue("kill-all-processes" in message) |
4645 | self.assertTrue("add-processes" in message) |
4646 | |
4647 | expected_process = {"pid": 1, "state": "R", "name": "init", |
4648 | "vm-size": 11676, "uid": 0, "gid": 0, |
4649 | "start-time": 112, "percent-cpu": 0.0} |
4650 | - self.assertEquals(message["add-processes"], [expected_process]) |
4651 | + self.assertEqual(message["add-processes"], [expected_process]) |
4652 | |
4653 | def test_plugin_manager(self): |
4654 | """Test plugin manager integration.""" |
4655 | @@ -196,48 +196,48 @@ |
4656 | |
4657 | plugin.exchange() |
4658 | messages = self.mstore.get_pending_messages() |
4659 | - self.assertEquals(len(messages), 2) |
4660 | + self.assertEqual(len(messages), 2) |
4661 | |
4662 | # The first time the plugin runs we expect all known processes |
4663 | # to be killed. |
4664 | message = messages[0] |
4665 | - self.assertEquals(message["type"], "active-process-info") |
4666 | + self.assertEqual(message["type"], "active-process-info") |
4667 | self.assertTrue("kill-all-processes" in message) |
4668 | - self.assertEquals(message["kill-all-processes"], True) |
4669 | + self.assertEqual(message["kill-all-processes"], True) |
4670 | self.assertTrue("add-processes" in message) |
4671 | expected_process_0 = {"state": "R", "gid": 0, "pid": 1, |
4672 | - "vm-size": 11676, "name": "init", |
4673 | + "vm-size": 11676, "name": "init", |
4674 | "uid": 0, "start-time": 101, |
4675 | "percent-cpu": 0.0} |
4676 | expected_process_1 = {"state": "T", "gid": 1000, "pid": 671, |
4677 | - "vm-size": 11676, "name": "blargh", |
4678 | + "vm-size": 11676, "name": "blargh", |
4679 | "uid": 1000, "start-time": 102, |
4680 | "percent-cpu": 0.0} |
4681 | expected_process_2 = {"state": "I", "gid": 1000, "pid": 672, |
4682 | - "vm-size": 11676, "name": "blarpy", |
4683 | + "vm-size": 11676, "name": "blarpy", |
4684 | "uid": 1000, "start-time": 104, |
4685 | "percent-cpu": 0.0} |
4686 | processes = message["add-processes"] |
4687 | processes.sort(key=operator.itemgetter("pid")) |
4688 | - self.assertEquals(processes, [expected_process_0, expected_process_1, |
4689 | - expected_process_2]) |
4690 | + self.assertEqual(processes, [expected_process_0, expected_process_1, |
4691 | + expected_process_2]) |
4692 | |
4693 | # Report diff-like changes to processes, such as terminated |
4694 | # processes and new processes. |
4695 | message = messages[1] |
4696 | - self.assertEquals(message["type"], "active-process-info") |
4697 | + self.assertEqual(message["type"], "active-process-info") |
4698 | |
4699 | self.assertTrue("add-processes" in message) |
4700 | - self.assertEquals(len(message["add-processes"]), 1) |
4701 | + self.assertEqual(len(message["add-processes"]), 1) |
4702 | expected_process = {"state": "R", "gid": 0, "pid": 12753, |
4703 | "vm-size": 11676, "name": "wubble", |
4704 | "uid": 0, "start-time": 107, |
4705 | "percent-cpu": 0.0} |
4706 | - self.assertEquals(message["add-processes"], [expected_process]) |
4707 | + self.assertEqual(message["add-processes"], [expected_process]) |
4708 | |
4709 | self.assertTrue("kill-processes" in message) |
4710 | - self.assertEquals(len(message["kill-processes"]), 1) |
4711 | - self.assertEquals(message["kill-processes"], [671]) |
4712 | + self.assertEqual(len(message["kill-processes"]), 1) |
4713 | + self.assertEqual(message["kill-processes"], [671]) |
4714 | |
4715 | def test_only_queue_message_when_process_data_is_available(self): |
4716 | """Test ensures that messages are only queued when data changes.""" |
4717 | @@ -249,10 +249,10 @@ |
4718 | self.monitor.add(plugin) |
4719 | |
4720 | plugin.exchange() |
4721 | - self.assertEquals(len(self.mstore.get_pending_messages()), 1) |
4722 | + self.assertEqual(len(self.mstore.get_pending_messages()), 1) |
4723 | |
4724 | plugin.exchange() |
4725 | - self.assertEquals(len(self.mstore.get_pending_messages()), 1) |
4726 | + self.assertEqual(len(self.mstore.get_pending_messages()), 1) |
4727 | |
4728 | def test_only_report_active_processes(self): |
4729 | """Test ensures the plugin only reports active processes.""" |
4730 | @@ -283,7 +283,7 @@ |
4731 | |
4732 | plugin.exchange() |
4733 | messages = self.mstore.get_pending_messages() |
4734 | - self.assertEquals(len(messages), 1) |
4735 | + self.assertEqual(len(messages), 1) |
4736 | |
4737 | message = messages[0] |
4738 | self.assertTrue("kill-all-processes" in message) |
4739 | @@ -292,7 +292,7 @@ |
4740 | |
4741 | pids = [process["pid"] for process in message["add-processes"]] |
4742 | pids.sort() |
4743 | - self.assertEquals(pids, [673, 674, 675, 676, 677, 678]) |
4744 | + self.assertEqual(pids, [673, 674, 675, 676, 677, 678]) |
4745 | |
4746 | def test_report_interesting_state_changes(self): |
4747 | """Test ensures that interesting state changes are reported.""" |
4748 | @@ -307,14 +307,14 @@ |
4749 | plugin.exchange() |
4750 | |
4751 | messages = self.mstore.get_pending_messages() |
4752 | - self.assertEquals(len(messages), 1) |
4753 | + self.assertEqual(len(messages), 1) |
4754 | message = messages[0] |
4755 | |
4756 | self.assertTrue("kill-all-processes" in message) |
4757 | self.assertTrue("kill-processes" not in message) |
4758 | self.assertTrue("add-processes" in message) |
4759 | - self.assertEquals(message["add-processes"][0]["pid"], 672) |
4760 | - self.assertEquals(message["add-processes"][0]["state"], u"R") |
4761 | + self.assertEqual(message["add-processes"][0]["pid"], 672) |
4762 | + self.assertEqual(message["add-processes"][0]["state"], u"R") |
4763 | |
4764 | # Convert the process to a zombie and ensure it gets reported. |
4765 | self.builder.remove_data(672) |
4766 | @@ -325,12 +325,12 @@ |
4767 | plugin.exchange() |
4768 | |
4769 | messages = self.mstore.get_pending_messages() |
4770 | - self.assertEquals(len(messages), 2) |
4771 | + self.assertEqual(len(messages), 2) |
4772 | message = messages[1] |
4773 | |
4774 | self.assertTrue("kill-all-processes" not in message) |
4775 | self.assertTrue("update-processes" in message) |
4776 | - self.assertEquals(message["update-processes"][0]["state"], u"Z") |
4777 | + self.assertEqual(message["update-processes"][0]["state"], u"Z") |
4778 | |
4779 | def test_call_on_accepted(self): |
4780 | """ |
4781 | @@ -340,12 +340,12 @@ |
4782 | plugin = ActiveProcessInfo(proc_dir=self.sample_dir, uptime=100, |
4783 | jiffies=10) |
4784 | self.monitor.add(plugin) |
4785 | - self.assertEquals(len(self.mstore.get_pending_messages()), 0) |
4786 | + self.assertEqual(len(self.mstore.get_pending_messages()), 0) |
4787 | result = self.monitor.fire_event( |
4788 | "message-type-acceptance-changed", "active-process-info", True) |
4789 | |
4790 | def assert_messages(ignored): |
4791 | - self.assertEquals(len(self.mstore.get_pending_messages()), 1) |
4792 | + self.assertEqual(len(self.mstore.get_pending_messages()), 1) |
4793 | |
4794 | result.addCallback(assert_messages) |
4795 | return result |
4796 | @@ -441,7 +441,7 @@ |
4797 | message = plugin.get_message() |
4798 | |
4799 | def assert_message(message_id): |
4800 | - self.assertEquals(message, plugin.get_message()) |
4801 | + self.assertEqual(message, plugin.get_message()) |
4802 | |
4803 | result = plugin.exchange() |
4804 | result.addCallback(assert_message) |
4805 | @@ -465,7 +465,7 @@ |
4806 | plugin.exchange() |
4807 | |
4808 | messages = self.mstore.get_pending_messages() |
4809 | - self.assertEquals(len(messages), 1) |
4810 | + self.assertEqual(len(messages), 1) |
4811 | |
4812 | self.builder.remove_data(1) |
4813 | self.builder.create_data(1, self.builder.RUNNING, uid=0, gid=0, |
4814 | @@ -474,7 +474,7 @@ |
4815 | plugin.exchange() |
4816 | |
4817 | messages = self.mstore.get_pending_messages() |
4818 | - self.assertEquals(len(messages), 2) |
4819 | + self.assertEqual(len(messages), 2) |
4820 | self.assertMessages(messages, [{"timestamp": 0, |
4821 | "api": SERVER_API, |
4822 | "type": "active-process-info", |
4823 | @@ -534,14 +534,14 @@ |
4824 | self.monitor.add(plugin) |
4825 | plugin.exchange() |
4826 | message = self.mstore.get_pending_messages()[0] |
4827 | - self.assertEquals(message["type"], "active-process-info") |
4828 | + self.assertEqual(message["type"], "active-process-info") |
4829 | self.assertTrue("kill-all-processes" in message) |
4830 | self.assertTrue("add-processes" in message) |
4831 | expected_process_0 = {"state": "R", "gid": 0, "pid": 1, |
4832 | "vm-size": 11676, "name": "NetworkManagerDaemon", |
4833 | "uid": 0, "start-time": 103, "percent-cpu": 0.0} |
4834 | processes = message["add-processes"] |
4835 | - self.assertEquals(processes, [expected_process_0]) |
4836 | + self.assertEqual(processes, [expected_process_0]) |
4837 | |
4838 | def test_strip_command_line_name_whitespace(self): |
4839 | """Whitespace should be stripped from command-line names.""" |
4840 | @@ -553,8 +553,8 @@ |
4841 | self.monitor.add(plugin) |
4842 | plugin.exchange() |
4843 | message = self.mstore.get_pending_messages()[0] |
4844 | - self.assertEquals(message["add-processes"][0]["name"], |
4845 | - u"postgres: writer process") |
4846 | + self.assertEqual(message["add-processes"][0]["name"], |
4847 | + u"postgres: writer process") |
4848 | |
4849 | def test_read_process_with_no_cmdline(self): |
4850 | """Test reading a process without a cmdline file.""" |
4851 | @@ -568,14 +568,14 @@ |
4852 | self.monitor.add(plugin) |
4853 | plugin.exchange() |
4854 | message = self.mstore.get_pending_messages()[0] |
4855 | - self.assertEquals(message["type"], "active-process-info") |
4856 | + self.assertEqual(message["type"], "active-process-info") |
4857 | self.assertTrue("kill-all-processes" in message) |
4858 | self.assertTrue("add-processes" in message) |
4859 | expected_process_0 = {"state": "R", "gid": 0, "pid": 1, |
4860 | "vm-size": 11676, "name": "ProcessWithLong", |
4861 | "uid": 0, "start-time": 103, "percent-cpu": 0.0} |
4862 | processes = message["add-processes"] |
4863 | - self.assertEquals(processes, [expected_process_0]) |
4864 | + self.assertEqual(processes, [expected_process_0]) |
4865 | |
4866 | def test_generate_cpu_usage(self): |
4867 | """ |
4868 | @@ -596,7 +596,7 @@ |
4869 | self.monitor.add(plugin) |
4870 | plugin.exchange() |
4871 | message = self.mstore.get_pending_messages()[0] |
4872 | - self.assertEquals(message["type"], "active-process-info") |
4873 | + self.assertEqual(message["type"], "active-process-info") |
4874 | self.assertTrue("kill-all-processes" in message) |
4875 | self.assertTrue("add-processes" in message) |
4876 | processes = message["add-processes"] |
4877 | @@ -605,7 +605,7 @@ |
4878 | "uid": 0, "start-time": 300, |
4879 | "percent-cpu": 4.00} |
4880 | processes = message["add-processes"] |
4881 | - self.assertEquals(processes, [expected_process_0]) |
4882 | + self.assertEqual(processes, [expected_process_0]) |
4883 | |
4884 | def test_generate_cpu_usage_capped(self): |
4885 | """ |
4886 | @@ -627,7 +627,7 @@ |
4887 | self.monitor.add(plugin) |
4888 | plugin.exchange() |
4889 | message = self.mstore.get_pending_messages()[0] |
4890 | - self.assertEquals(message["type"], "active-process-info") |
4891 | + self.assertEqual(message["type"], "active-process-info") |
4892 | self.assertTrue("kill-all-processes" in message) |
4893 | self.assertTrue("add-processes" in message) |
4894 | processes = message["add-processes"] |
4895 | @@ -636,4 +636,4 @@ |
4896 | "uid": 0, "start-time": 300, |
4897 | "percent-cpu": 99.00} |
4898 | processes = message["add-processes"] |
4899 | - self.assertEquals(processes, [expected_process_0]) |
4900 | + self.assertEqual(processes, [expected_process_0]) |
4901 | |
4902 | === modified file 'landscape/monitor/tests/test_aptpreferences.py' |
4903 | --- landscape/monitor/tests/test_aptpreferences.py 2010-12-10 13:49:46 +0000 |
4904 | +++ landscape/monitor/tests/test_aptpreferences.py 2011-07-06 21:14:28 +0000 |
4905 | @@ -33,8 +33,8 @@ |
4906 | preferences_filename = os.path.join(self.etc_apt_directory, |
4907 | "preferences") |
4908 | self.makeFile(path=preferences_filename, content="crap") |
4909 | - self.assertEquals(self.plugin.get_data(), |
4910 | - {preferences_filename: "crap"}) |
4911 | + self.assertEqual(self.plugin.get_data(), |
4912 | + {preferences_filename: "crap"}) |
4913 | |
4914 | def test_get_data_with_empty_preferences_directory(self): |
4915 | """ |
4916 | @@ -56,8 +56,8 @@ |
4917 | self.makeDir(path=preferences_directory) |
4918 | filename1 = self.makeFile(dirname=preferences_directory, content="foo") |
4919 | filename2 = self.makeFile(dirname=preferences_directory, content="bar") |
4920 | - self.assertEquals(self.plugin.get_data(), {filename1: "foo", |
4921 | - filename2: "bar"}) |
4922 | + self.assertEqual(self.plugin.get_data(), {filename1: "foo", |
4923 | + filename2: "bar"}) |
4924 | |
4925 | def test_get_data_with_one_big_file(self): |
4926 | """ |
4927 | @@ -68,7 +68,7 @@ |
4928 | "preferences") |
4929 | limit = self.plugin.size_limit |
4930 | self.makeFile(path=preferences_filename, content="a" * (limit + 1)) |
4931 | - self.assertEquals(self.plugin.get_data(), { |
4932 | + self.assertEqual(self.plugin.get_data(), { |
4933 | preferences_filename: "a" * (limit - len(preferences_filename))}) |
4934 | |
4935 | def test_get_data_with_many_big_files(self): |
4936 | @@ -84,9 +84,9 @@ |
4937 | content="a" * (limit / 2)) |
4938 | filename2 = self.makeFile(dirname=preferences_directory, |
4939 | content="b" * (limit / 2)) |
4940 | - self.assertEquals(self.plugin.get_data(), |
4941 | - {filename1: "a" * (limit / 2 - len(filename1)), |
4942 | - filename2: "b" * (limit / 2 - len(filename2))}) |
4943 | + self.assertEqual(self.plugin.get_data(), |
4944 | + {filename1: "a" * (limit / 2 - len(filename1)), |
4945 | + filename2: "b" * (limit / 2 - len(filename2))}) |
4946 | |
4947 | def test_exchange_without_apt_preferences_data(self): |
4948 | """ |
4949 | @@ -94,7 +94,7 @@ |
4950 | """ |
4951 | self.mstore.set_accepted_types(["apt-preferences"]) |
4952 | self.plugin.exchange() |
4953 | - self.assertEquals(self.mstore.get_pending_messages(), []) |
4954 | + self.assertEqual(self.mstore.get_pending_messages(), []) |
4955 | |
4956 | def test_exchange(self): |
4957 | """ |
4958 | @@ -113,10 +113,10 @@ |
4959 | content="foo") |
4960 | self.plugin.exchange() |
4961 | messages = self.mstore.get_pending_messages() |
4962 | - self.assertEquals(messages[0]["type"], "apt-preferences") |
4963 | - self.assertEquals(messages[0]["data"], |
4964 | - {main_preferences_filename: u"crap", |
4965 | - sub_preferences_filename: u"foo"}) |
4966 | + self.assertEqual(messages[0]["type"], "apt-preferences") |
4967 | + self.assertEqual(messages[0]["data"], |
4968 | + {main_preferences_filename: u"crap", |
4969 | + sub_preferences_filename: u"foo"}) |
4970 | for filename in messages[0]["data"]: |
4971 | self.assertTrue(isinstance(filename, unicode)) |
4972 | |
4973 | @@ -125,7 +125,7 @@ |
4974 | os.remove(sub_preferences_filename) |
4975 | self.plugin.exchange() |
4976 | messages = self.mstore.get_pending_messages() |
4977 | - self.assertEquals(messages[1]["type"], "apt-preferences") |
4978 | + self.assertEqual(messages[1]["type"], "apt-preferences") |
4979 | self.assertIdentical(messages[1]["data"], None) |
4980 | |
4981 | def test_exchange_only_once(self): |
4982 | @@ -140,9 +140,9 @@ |
4983 | self.makeFile(path=preferences_filename, content="crap") |
4984 | self.plugin.exchange() |
4985 | messages = self.mstore.get_pending_messages() |
4986 | - self.assertEquals(len(messages), 1) |
4987 | + self.assertEqual(len(messages), 1) |
4988 | messages = self.mstore.get_pending_messages() |
4989 | - self.assertEquals(len(messages), 1) |
4990 | + self.assertEqual(len(messages), 1) |
4991 | |
4992 | def test_run(self): |
4993 | """ |
4994 | @@ -174,4 +174,4 @@ |
4995 | self.reactor.fire("resynchronize") |
4996 | self.plugin.run() |
4997 | messages = self.mstore.get_pending_messages() |
4998 | - self.assertEquals(len(messages), 2) |
4999 | + self.assertEqual(len(messages), 2) |
5000 |
Nice cleanup, +1!
Yes, the sqlite3 import workaround is for Dapper, I guess we can just drop it. We're not going to release for Dapper anymore.