Meliae

Merge lp:~cjwatson/meliae/py3-fix-scanner-tests into lp:meliae

  1. py3-fix-scanner-tests
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Approved by: John A Meinel
Approved revision: 224
Merged at revision: 225
Proposed branch: lp:~cjwatson/meliae/py3-fix-scanner-tests
Merge into: lp:meliae
Diff against target: 34 lines (+8/-10)
1 file modified
meliae/tests/test_scanner.py (+8/-10)
To merge this branch: bzr merge lp:~cjwatson/meliae/py3-fix-scanner-tests
Reviewer Review Type Date Requested Status
Meliae Development Team Pending
Review via email: mp+380585@code.launchpad.net

Commit message

Fix some failures in meliae.tests.test_scanner on Python 3.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'meliae/tests/test_scanner.py'
2--- meliae/tests/test_scanner.py 2009-12-07 11:21:03 +0000
3+++ meliae/tests/test_scanner.py 2020-03-11 20:52:12 +0000
4@@ -41,7 +41,7 @@
5 # so we need to split it back into 1-line-per-record
6 ref_lines = [test__scanner.py_dump_object_info(ref_obj)
7 for ref_obj in ref_objs]
8- ref_lines = set(''.join(ref_lines).splitlines(True))
9+ ref_lines = set(b''.join(ref_lines).splitlines(True))
10 self.assertEqual(sorted(ref_lines), sorted(lines))
11
12 def test_dump_str(self):
13@@ -98,15 +98,13 @@
14 self.assertRecursiveSize(1, scanner.size_of(l), l)
15
16 def test_referenced(self):
17- s1 = 'this is a simple string'
18- s2 = 'and this is another one'
19- s3 = s1 + s2
20- s4 = 'this is a' + ' simple string'# same as s1, but diff object
21- self.assertTrue(s1 is not s4)
22- self.assertTrue(s1 == s4)
23- d = {s1:s2, s3:s4}
24- total_size = (scanner.size_of(s1) + scanner.size_of(s2)
25- + scanner.size_of(s3) + scanner.size_of(s4)
26+ o1 = object()
27+ s2 = 'this is a simple string'
28+ o3 = object()
29+ s4 = 'and this is another one'
30+ d = {o1: s2, o3: s4}
31+ total_size = (scanner.size_of(o1) + scanner.size_of(s2)
32+ + scanner.size_of(o3) + scanner.size_of(s4)
33 + scanner.size_of(d))
34 self.assertRecursiveSize(5, total_size, d)
35

Subscribers

People subscribed via source and target branches

to all changes: