[Python-checkins] cpython (merge 3.2 -> default): MERGE: Better test for Issue #15402: Add a __sizeof__ method to struct.Struct

[jesus.cea]

http://hg.python.org/cpython/rev/b9a3ed1b14b9
changeset:   78260:b9a3ed1b14b9
parent:      78257:03063e718f5f
parent:      78259:1911e192af0d
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Jul 23 18:16:18 2012 +0200
summary:
  MERGE: Better test for Issue #15402: Add a __sizeof__ method to struct.Struct

files:
  Doc/ACKS.txt            |  1 +
  Lib/test/test_struct.py |  8 ++++----
  2 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -205,6 +205,7 @@
    * Anthony Starks
    * Greg Stein
    * Peter Stoehr
+   * Serhiy Storchaka
    * Mark Summerfield
    * Reuben Sumner
    * Kalle Svensson
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -575,12 +575,12 @@
     def test_sizeof(self):
         self.assertGreater(sys.getsizeof(struct.Struct('BHILfdspP')),
                            sys.getsizeof(struct.Struct('B')))
-        self.assertGreaterEqual(sys.getsizeof(struct.Struct('123B')),
+        self.assertGreater(sys.getsizeof(struct.Struct('123B')),
                                 sys.getsizeof(struct.Struct('B')))
-        self.assertGreaterEqual(sys.getsizeof(struct.Struct('B' * 123)),
+        self.assertGreater(sys.getsizeof(struct.Struct('B' * 1234)),
                                 sys.getsizeof(struct.Struct('123B')))
-        self.assertGreaterEqual(sys.getsizeof(struct.Struct('123xB')),
-                                sys.getsizeof(struct.Struct('B')))
+        self.assertGreater(sys.getsizeof(struct.Struct('1234B')),
+                                sys.getsizeof(struct.Struct('123B')))
 
 def test_main():
     run_unittest(StructTest)

-- 
Repository URL: http://hg.python.org/cpython