Reorganize pickle/cPickle testing so the tests pass regardless of the order
they're run.
diff --git a/Lib/test/output/test_cpickle b/Lib/test/output/test_cpickle
index 696288a..d3b5cc5 100644
--- a/Lib/test/output/test_cpickle
+++ b/Lib/test/output/test_cpickle
@@ -11,15 +11,3 @@
ok
dumps() RECURSIVE
ok
-dumps()
-loads()
-ok
-loads() DATA
-ok
-dumps() binary
-loads() binary
-ok
-loads() BINDATA
-ok
-dumps() RECURSIVE
-ok
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
new file mode 100644
index 0000000..460a77f
--- /dev/null
+++ b/Lib/test/pickletester.py
@@ -0,0 +1,153 @@
+# test_pick and test_cpickle both use this.
+
+# break into multiple strings to please font-lock-mode
+DATA = """(lp0
+I0
+aL1L
+aF2.0
+ac__builtin__
+complex
+p1
+""" \
+"""(F3.0
+F0.0
+tp2
+Rp3
+a(S'abc'
+p4
+g4
+""" \
+"""(i__main__
+C
+p5
+""" \
+"""(dp6
+S'foo'
+p7
+I1
+sS'bar'
+p8
+I2
+sbg5
+tp9
+ag9
+aI5
+a.
+"""
+
+BINDATA = ']q\000(K\000L1L\012G@\000\000\000\000\000\000\000c__builtin__\012complex\012q\001(G@\010\000\000\000\000\000\000G\000\000\000\000\000\000\000\000tq\002Rq\003(U\003abcq\004h\004(c__main__\012C\012q\005oq\006}q\007(U\003fooq\010K\001U\003barq\011K\002ubh\006tq\012h\012K\005e.'
+
+class C:
+ def __cmp__(self, other):
+ return cmp(self.__dict__, other.__dict__)
+
+import __main__
+__main__.C = C
+
+# Call this with the module to be tested (pickle or cPickle).
+
+def dotest(pickle):
+ c = C()
+ c.foo = 1
+ c.bar = 2
+ x = [0, 1L, 2.0, 3.0+0j]
+ y = ('abc', 'abc', c, c)
+ x.append(y)
+ x.append(y)
+ x.append(5)
+ r = []
+ r.append(r)
+ print "dumps()"
+ s = pickle.dumps(x)
+ print "loads()"
+ x2 = pickle.loads(s)
+ if x2 == x: print "ok"
+ else: print "bad"
+ print "loads() DATA"
+ x2 = pickle.loads(DATA)
+ if x2 == x: print "ok"
+ else: print "bad"
+ print "dumps() binary"
+ s = pickle.dumps(x, 1)
+ print "loads() binary"
+ x2 = pickle.loads(s)
+ if x2 == x: print "ok"
+ else: print "bad"
+ print "loads() BINDATA"
+ x2 = pickle.loads(BINDATA)
+ if x2 == x: print "ok"
+ else: print "bad"
+ s = pickle.dumps(r)
+ print "dumps() RECURSIVE"
+ x2 = pickle.loads(s)
+ if x2 == r: print "ok"
+ else: print "bad"
+ # don't create cyclic garbage
+ del x2[0]
+ del r[0]
+
+ # Test protection against closed files
+ import tempfile, os
+ fn = tempfile.mktemp()
+ f = open(fn, "w")
+ f.close()
+ try:
+ pickle.dump(123, f)
+ except ValueError:
+ pass
+ else:
+ print "dump to closed file should raise ValueError"
+ f = open(fn, "r")
+ f.close()
+ try:
+ pickle.load(f)
+ except ValueError:
+ pass
+ else:
+ print "load from closed file should raise ValueError"
+ os.remove(fn)
+
+ # Test specific bad cases
+ for i in range(10):
+ try:
+ x = pickle.loads('garyp')
+ except KeyError, y:
+ # pickle
+ del y
+ except pickle.BadPickleGet, y:
+ # cPickle
+ del y
+ else:
+ print "unexpected success!"
+ break
+
+ # Test insecure strings
+ insecure = ["abc", "2 + 2", # not quoted
+ "'abc' + 'def'", # not a single quoted string
+ "'abc", # quote is not closed
+ "'abc\"", # open quote and close quote don't match
+ "'abc' ?", # junk after close quote
+ # some tests of the quoting rules
+ "'abc\"\''",
+ "'\\\\a\'\'\'\\\'\\\\\''",
+ ]
+ for s in insecure:
+ buf = "S" + s + "\012p0\012."
+ try:
+ x = pickle.loads(buf)
+ except ValueError:
+ pass
+ else:
+ print "accepted insecure string: %s" % repr(buf)
+
+ # Test some Unicode end cases
+ endcases = [u'', u'<\\u>', u'<\\\u1234>', u'<\n>', u'<\\>']
+ for u in endcases:
+ try:
+ u2 = pickle.loads(pickle.dumps(u))
+ except Exception, msg:
+ print "Endcase exception: %s => %s(%s)" % \
+ (`u`, msg.__class__.__name__, str(msg))
+ else:
+ if u2 != u:
+ print "Endcase failure: %s => %s" % (`u`, `u2`)
diff --git a/Lib/test/test_cpickle.py b/Lib/test/test_cpickle.py
index f2aa0fe..c03df38 100644
--- a/Lib/test/test_cpickle.py
+++ b/Lib/test/test_cpickle.py
@@ -1,5 +1,3 @@
-# Test the cPickle module
-
import cPickle
-import test_pickle
-test_pickle.dotest(cPickle)
+import pickletester
+pickletester.dotest(cPickle)
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index c14daf4..9fe399f 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -1,155 +1,3 @@
-# Test the pickle module
-
-# break into multiple strings to please font-lock-mode
-DATA = """(lp0
-I0
-aL1L
-aF2.0
-ac__builtin__
-complex
-p1
-""" \
-"""(F3.0
-F0.0
-tp2
-Rp3
-a(S'abc'
-p4
-g4
-""" \
-"""(i__main__
-C
-p5
-""" \
-"""(dp6
-S'foo'
-p7
-I1
-sS'bar'
-p8
-I2
-sbg5
-tp9
-ag9
-aI5
-a.
-"""
-
-BINDATA = ']q\000(K\000L1L\012G@\000\000\000\000\000\000\000c__builtin__\012complex\012q\001(G@\010\000\000\000\000\000\000G\000\000\000\000\000\000\000\000tq\002Rq\003(U\003abcq\004h\004(c__main__\012C\012q\005oq\006}q\007(U\003fooq\010K\001U\003barq\011K\002ubh\006tq\012h\012K\005e.'
-
-class C:
- def __cmp__(self, other):
- return cmp(self.__dict__, other.__dict__)
-
-import __main__
-__main__.C = C
-
-def dotest(pickle):
- c = C()
- c.foo = 1
- c.bar = 2
- x = [0, 1L, 2.0, 3.0+0j]
- y = ('abc', 'abc', c, c)
- x.append(y)
- x.append(y)
- x.append(5)
- r = []
- r.append(r)
- print "dumps()"
- s = pickle.dumps(x)
- print "loads()"
- x2 = pickle.loads(s)
- if x2 == x: print "ok"
- else: print "bad"
- print "loads() DATA"
- x2 = pickle.loads(DATA)
- if x2 == x: print "ok"
- else: print "bad"
- print "dumps() binary"
- s = pickle.dumps(x, 1)
- print "loads() binary"
- x2 = pickle.loads(s)
- if x2 == x: print "ok"
- else: print "bad"
- print "loads() BINDATA"
- x2 = pickle.loads(BINDATA)
- if x2 == x: print "ok"
- else: print "bad"
- s = pickle.dumps(r)
- print "dumps() RECURSIVE"
- x2 = pickle.loads(s)
- if x2 == r: print "ok"
- else: print "bad"
- # don't create cyclic garbage
- del x2[0]
- del r[0]
-
- # Test protection against closed files
- import tempfile, os
- fn = tempfile.mktemp()
- f = open(fn, "w")
- f.close()
- try:
- pickle.dump(123, f)
- except ValueError:
- pass
- else:
- print "dump to closed file should raise ValueError"
- f = open(fn, "r")
- f.close()
- try:
- pickle.load(f)
- except ValueError:
- pass
- else:
- print "load from closed file should raise ValueError"
- os.remove(fn)
-
- # Test specific bad cases
- for i in range(10):
- try:
- x = pickle.loads('garyp')
- except KeyError, y:
- # pickle
- del y
- except pickle.BadPickleGet, y:
- # cPickle
- del y
- else:
- print "unexpected success!"
- break
-
- # Test insecure strings
- insecure = ["abc", "2 + 2", # not quoted
- "'abc' + 'def'", # not a single quoted string
- "'abc", # quote is not closed
- "'abc\"", # open quote and close quote don't match
- "'abc' ?", # junk after close quote
- # some tests of the quoting rules
- "'abc\"\''",
- "'\\\\a\'\'\'\\\'\\\\\''",
- ]
- for s in insecure:
- buf = "S" + s + "\012p0\012."
- try:
- x = pickle.loads(buf)
- except ValueError:
- pass
- else:
- print "accepted insecure string: %s" % repr(buf)
-
- # Test some Unicode end cases
- endcases = [u'', u'<\\u>', u'<\\\u1234>', u'<\n>', u'<\\>']
- for u in endcases:
- try:
- u2 = pickle.loads(pickle.dumps(u))
- except Exception, msg:
- print "Endcase exception: %s => %s(%s)" % \
- (`u`, msg.__class__.__name__, str(msg))
- else:
- if u2 != u:
- print "Endcase failure: %s => %s" % (`u`, `u2`)
-
-
import pickle
-dotest(pickle)
+import pickletester
+pickletester.dotest(pickle)