Rev 189: Fix one more test. Now fixed bug #739310. in http://bazaar.launchpad.net/%2Bbranch/meliae

[John Arbash Meinel]

At http://bazaar.launchpad.net/%2Bbranch/meliae

------------------------------------------------------------
revno: 189
revision-id: john at arbash-meinel.com-20110322104910-81h68865abcpr111
parent: john at arbash-meinel.com-20110322104515-iuccimlh0rl8fi2o
fixes bug(s): https://launchpad.net/bugs/739310
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: meliae
timestamp: Tue 2011-03-22 11:49:10 +0100
message:
  Fix one more test. Now fixed bug #739310.
-------------- next part --------------
=== modified file 'CHANGES.txt'
--- a/CHANGES.txt	2010-08-10 16:20:09 +0000
+++ b/CHANGES.txt	2011-03-22 10:49:10 +0000
@@ -34,6 +34,11 @@
   takes a type name and some callbacks to determine the size of an
   object. This lets you register them without importing the module.
 
+* Small updates to fix the test suite under python2.7 and 64-bit
+  architectures. PyString changed size in 2.7, and we weren't
+  accounting for alignment effects on 64-bit machines.
+  (John Arbash Meinel, Jelmer Vernooij, #739310)
+
 Meliae 0.3
 ##########
 

=== modified file 'meliae/tests/test__loader.py'
--- a/meliae/tests/test__loader.py	2011-03-22 10:45:15 +0000
+++ b/meliae/tests/test__loader.py	2011-03-22 10:49:10 +0000
@@ -253,7 +253,8 @@
         moc.add(0, 'foo', 100, children=[1234], parent_list=[3456, 7890])
         moc.add(1, 'foo', 100, children=[1234], parent_list=[3456, 7890])
         del moc[1]
-        self.assertSizeOf(4+1024+8+2+3, moc, extra_size=3*4, has_gc=False)
+        self.assertSizeOf(4+1024+8+2+3, moc, extra_size=_memobj_extra_size,
+                          has_gc=False)
 
     def test_traverse_empty(self):
         # With nothing present, we return no referents