Why was the old test suite removed? Even if everything is covered by the test file (and that isn't clear from this checkin), I don't see anything wrong with a quick test that doesn't require loading the whole testing apparatus. (I would have no objection to including a comment saying that the majority of the tests are in the test file; I just wonder why they have to be removed entirely.)
On Fri, Aug 5, 2011 at 5:06 PM, sandro.tosi <python-check...@python.org> wrote: > http://hg.python.org/cpython/rev/74e79b2c114a > changeset: 71749:74e79b2c114a > user: Sandro Tosi <sandro.t...@gmail.com> > date: Fri Aug 05 23:05:35 2011 +0200 > summary: > #11572: improvements to copy module tests along with removal of old test > suite > > files: > Lib/copy.py | 65 ----------- > Lib/test/test_copy.py | 168 ++++++++++++++++------------- > 2 files changed, 95 insertions(+), 138 deletions(-) > > > diff --git a/Lib/copy.py b/Lib/copy.py > --- a/Lib/copy.py > +++ b/Lib/copy.py > @@ -323,68 +323,3 @@ > # Helper for instance creation without calling __init__ > class _EmptyClass: > pass > - > -def _test(): > - l = [None, 1, 2, 3.14, 'xyzzy', (1, 2), [3.14, 'abc'], > - {'abc': 'ABC'}, (), [], {}] > - l1 = copy(l) > - print(l1==l) > - l1 = map(copy, l) > - print(l1==l) > - l1 = deepcopy(l) > - print(l1==l) > - class C: > - def __init__(self, arg=None): > - self.a = 1 > - self.arg = arg > - if __name__ == '__main__': > - import sys > - file = sys.argv[0] > - else: > - file = __file__ > - self.fp = open(file) > - self.fp.close() > - def __getstate__(self): > - return {'a': self.a, 'arg': self.arg} > - def __setstate__(self, state): > - for key, value in state.items(): > - setattr(self, key, value) > - def __deepcopy__(self, memo=None): > - new = self.__class__(deepcopy(self.arg, memo)) > - new.a = self.a > - return new > - c = C('argument sketch') > - l.append(c) > - l2 = copy(l) > - print(l == l2) > - print(l) > - print(l2) > - l2 = deepcopy(l) > - print(l == l2) > - print(l) > - print(l2) > - l.append({l[1]: l, 'xyz': l[2]}) > - l3 = copy(l) > - import reprlib > - print(map(reprlib.repr, l)) > - print(map(reprlib.repr, l1)) > - print(map(reprlib.repr, l2)) > - print(map(reprlib.repr, l3)) > - l3 = deepcopy(l) > - print(map(reprlib.repr, l)) > - print(map(reprlib.repr, l1)) > - print(map(reprlib.repr, l2)) > - print(map(reprlib.repr, l3)) > - class odict(dict): > - def __init__(self, d = {}): > - self.a = 99 > - dict.__init__(self, d) > - def __setitem__(self, k, i): > - dict.__setitem__(self, k, i) > - self.a > - o = odict({"A" : "B"}) > - x = deepcopy(o) > - print(o, x) > - > -if __name__ == '__main__': > - _test() > diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py > --- a/Lib/test/test_copy.py > +++ b/Lib/test/test_copy.py > @@ -17,7 +17,7 @@ > # Attempt full line coverage of copy.py from top to bottom > > def test_exceptions(self): > - self.assertTrue(copy.Error is copy.error) > + self.assertIs(copy.Error, copy.error) > self.assertTrue(issubclass(copy.Error, Exception)) > > # The copy() method > @@ -54,20 +54,26 @@ > def test_copy_reduce_ex(self): > class C(object): > def __reduce_ex__(self, proto): > + c.append(1) > return "" > def __reduce__(self): > - raise support.TestFailed("shouldn't call this") > + self.fail("shouldn't call this") > + c = [] > x = C() > y = copy.copy(x) > - self.assertTrue(y is x) > + self.assertIs(y, x) > + self.assertEqual(c, [1]) > > def test_copy_reduce(self): > class C(object): > def __reduce__(self): > + c.append(1) > return "" > + c = [] > x = C() > y = copy.copy(x) > - self.assertTrue(y is x) > + self.assertIs(y, x) > + self.assertEqual(c, [1]) > > def test_copy_cant(self): > class C(object): > @@ -91,7 +97,7 @@ > "hello", "hello\u1234", f.__code__, > NewStyle, range(10), Classic, max] > for x in tests: > - self.assertTrue(copy.copy(x) is x, repr(x)) > + self.assertIs(copy.copy(x), x) > > def test_copy_list(self): > x = [1, 2, 3] > @@ -185,9 +191,9 @@ > x = [x, x] > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(y is not x) > - self.assertTrue(y[0] is not x[0]) > - self.assertTrue(y[0] is y[1]) > + self.assertIsNot(y, x) > + self.assertIsNot(y[0], x[0]) > + self.assertIs(y[0], y[1]) > > def test_deepcopy_issubclass(self): > # XXX Note: there's no way to test the TypeError coming out of > @@ -227,20 +233,26 @@ > def test_deepcopy_reduce_ex(self): > class C(object): > def __reduce_ex__(self, proto): > + c.append(1) > return "" > def __reduce__(self): > - raise support.TestFailed("shouldn't call this") > + self.fail("shouldn't call this") > + c = [] > x = C() > y = copy.deepcopy(x) > - self.assertTrue(y is x) > + self.assertIs(y, x) > + self.assertEqual(c, [1]) > > def test_deepcopy_reduce(self): > class C(object): > def __reduce__(self): > + c.append(1) > return "" > + c = [] > x = C() > y = copy.deepcopy(x) > - self.assertTrue(y is x) > + self.assertIs(y, x) > + self.assertEqual(c, [1]) > > def test_deepcopy_cant(self): > class C(object): > @@ -264,14 +276,14 @@ > "hello", "hello\u1234", f.__code__, > NewStyle, range(10), Classic, max] > for x in tests: > - self.assertTrue(copy.deepcopy(x) is x, repr(x)) > + self.assertIs(copy.deepcopy(x), x) > > def test_deepcopy_list(self): > x = [[1, 2], 3] > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(x is not y) > - self.assertTrue(x[0] is not y[0]) > + self.assertIsNot(x, y) > + self.assertIsNot(x[0], y[0]) > > def test_deepcopy_reflexive_list(self): > x = [] > @@ -279,16 +291,26 @@ > y = copy.deepcopy(x) > for op in comparisons: > self.assertRaises(RuntimeError, op, y, x) > - self.assertTrue(y is not x) > - self.assertTrue(y[0] is y) > + self.assertIsNot(y, x) > + self.assertIs(y[0], y) > self.assertEqual(len(y), 1) > > + def test_deepcopy_empty_tuple(self): > + x = () > + y = copy.deepcopy(x) > + self.assertIs(x, y) > + > def test_deepcopy_tuple(self): > x = ([1, 2], 3) > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(x is not y) > - self.assertTrue(x[0] is not y[0]) > + self.assertIsNot(x, y) > + self.assertIsNot(x[0], y[0]) > + > + def test_deepcopy_tuple_of_immutables(self): > + x = ((1, 2), 3) > + y = copy.deepcopy(x) > + self.assertIs(x, y) > > def test_deepcopy_reflexive_tuple(self): > x = ([],) > @@ -296,16 +318,16 @@ > y = copy.deepcopy(x) > for op in comparisons: > self.assertRaises(RuntimeError, op, y, x) > - self.assertTrue(y is not x) > - self.assertTrue(y[0] is not x[0]) > - self.assertTrue(y[0][0] is y) > + self.assertIsNot(y, x) > + self.assertIsNot(y[0], x[0]) > + self.assertIs(y[0][0], y) > > def test_deepcopy_dict(self): > x = {"foo": [1, 2], "bar": 3} > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(x is not y) > - self.assertTrue(x["foo"] is not y["foo"]) > + self.assertIsNot(x, y) > + self.assertIsNot(x["foo"], y["foo"]) > > def test_deepcopy_reflexive_dict(self): > x = {} > @@ -315,8 +337,8 @@ > self.assertRaises(TypeError, op, y, x) > for op in equality_comparisons: > self.assertRaises(RuntimeError, op, y, x) > - self.assertTrue(y is not x) > - self.assertTrue(y['foo'] is y) > + self.assertIsNot(y, x) > + self.assertIs(y['foo'], y) > self.assertEqual(len(y), 1) > > def test_deepcopy_keepalive(self): > @@ -349,7 +371,7 @@ > x = C([42]) > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(y.foo is not x.foo) > + self.assertIsNot(y.foo, x.foo) > > def test_deepcopy_inst_deepcopy(self): > class C: > @@ -362,8 +384,8 @@ > x = C([42]) > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(y is not x) > - self.assertTrue(y.foo is not x.foo) > + self.assertIsNot(y, x) > + self.assertIsNot(y.foo, x.foo) > > def test_deepcopy_inst_getinitargs(self): > class C: > @@ -376,8 +398,8 @@ > x = C([42]) > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(y is not x) > - self.assertTrue(y.foo is not x.foo) > + self.assertIsNot(y, x) > + self.assertIsNot(y.foo, x.foo) > > def test_deepcopy_inst_getstate(self): > class C: > @@ -390,8 +412,8 @@ > x = C([42]) > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(y is not x) > - self.assertTrue(y.foo is not x.foo) > + self.assertIsNot(y, x) > + self.assertIsNot(y.foo, x.foo) > > def test_deepcopy_inst_setstate(self): > class C: > @@ -404,8 +426,8 @@ > x = C([42]) > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(y is not x) > - self.assertTrue(y.foo is not x.foo) > + self.assertIsNot(y, x) > + self.assertIsNot(y.foo, x.foo) > > def test_deepcopy_inst_getstate_setstate(self): > class C: > @@ -420,8 +442,8 @@ > x = C([42]) > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(y is not x) > - self.assertTrue(y.foo is not x.foo) > + self.assertIsNot(y, x) > + self.assertIsNot(y.foo, x.foo) > > def test_deepcopy_reflexive_inst(self): > class C: > @@ -429,8 +451,8 @@ > x = C() > x.foo = x > y = copy.deepcopy(x) > - self.assertTrue(y is not x) > - self.assertTrue(y.foo is y) > + self.assertIsNot(y, x) > + self.assertIs(y.foo, y) > > # _reconstruct() > > @@ -440,9 +462,9 @@ > return "" > x = C() > y = copy.copy(x) > - self.assertTrue(y is x) > + self.assertIs(y, x) > y = copy.deepcopy(x) > - self.assertTrue(y is x) > + self.assertIs(y, x) > > def test_reconstruct_nostate(self): > class C(object): > @@ -451,9 +473,9 @@ > x = C() > x.foo = 42 > y = copy.copy(x) > - self.assertTrue(y.__class__ is x.__class__) > + self.assertIs(y.__class__, x.__class__) > y = copy.deepcopy(x) > - self.assertTrue(y.__class__ is x.__class__) > + self.assertIs(y.__class__, x.__class__) > > def test_reconstruct_state(self): > class C(object): > @@ -467,7 +489,7 @@ > self.assertEqual(y, x) > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(y.foo is not x.foo) > + self.assertIsNot(y.foo, x.foo) > > def test_reconstruct_state_setstate(self): > class C(object): > @@ -483,7 +505,7 @@ > self.assertEqual(y, x) > y = copy.deepcopy(x) > self.assertEqual(y, x) > - self.assertTrue(y.foo is not x.foo) > + self.assertIsNot(y.foo, x.foo) > > def test_reconstruct_reflexive(self): > class C(object): > @@ -491,8 +513,8 @@ > x = C() > x.foo = x > y = copy.deepcopy(x) > - self.assertTrue(y is not x) > - self.assertTrue(y.foo is y) > + self.assertIsNot(y, x) > + self.assertIs(y.foo, y) > > # Additions for Python 2.3 and pickle protocol 2 > > @@ -506,12 +528,12 @@ > x = C([[1, 2], 3]) > y = copy.copy(x) > self.assertEqual(x, y) > - self.assertTrue(x is not y) > - self.assertTrue(x[0] is y[0]) > + self.assertIsNot(x, y) > + self.assertIs(x[0], y[0]) > y = copy.deepcopy(x) > self.assertEqual(x, y) > - self.assertTrue(x is not y) > - self.assertTrue(x[0] is not y[0]) > + self.assertIsNot(x, y) > + self.assertIsNot(x[0], y[0]) > > def test_reduce_5tuple(self): > class C(dict): > @@ -523,12 +545,12 @@ > x = C([("foo", [1, 2]), ("bar", 3)]) > y = copy.copy(x) > self.assertEqual(x, y) > - self.assertTrue(x is not y) > - self.assertTrue(x["foo"] is y["foo"]) > + self.assertIsNot(x, y) > + self.assertIs(x["foo"], y["foo"]) > y = copy.deepcopy(x) > self.assertEqual(x, y) > - self.assertTrue(x is not y) > - self.assertTrue(x["foo"] is not y["foo"]) > + self.assertIsNot(x, y) > + self.assertIsNot(x["foo"], y["foo"]) > > def test_copy_slots(self): > class C(object): > @@ -536,7 +558,7 @@ > x = C() > x.foo = [42] > y = copy.copy(x) > - self.assertTrue(x.foo is y.foo) > + self.assertIs(x.foo, y.foo) > > def test_deepcopy_slots(self): > class C(object): > @@ -545,7 +567,7 @@ > x.foo = [42] > y = copy.deepcopy(x) > self.assertEqual(x.foo, y.foo) > - self.assertTrue(x.foo is not y.foo) > + self.assertIsNot(x.foo, y.foo) > > def test_deepcopy_dict_subclass(self): > class C(dict): > @@ -562,7 +584,7 @@ > y = copy.deepcopy(x) > self.assertEqual(x, y) > self.assertEqual(x._keys, y._keys) > - self.assertTrue(x is not y) > + self.assertIsNot(x, y) > x['bar'] = 1 > self.assertNotEqual(x, y) > self.assertNotEqual(x._keys, y._keys) > @@ -575,8 +597,8 @@ > y = copy.copy(x) > self.assertEqual(list(x), list(y)) > self.assertEqual(x.foo, y.foo) > - self.assertTrue(x[0] is y[0]) > - self.assertTrue(x.foo is y.foo) > + self.assertIs(x[0], y[0]) > + self.assertIs(x.foo, y.foo) > > def test_deepcopy_list_subclass(self): > class C(list): > @@ -586,8 +608,8 @@ > y = copy.deepcopy(x) > self.assertEqual(list(x), list(y)) > self.assertEqual(x.foo, y.foo) > - self.assertTrue(x[0] is not y[0]) > - self.assertTrue(x.foo is not y.foo) > + self.assertIsNot(x[0], y[0]) > + self.assertIsNot(x.foo, y.foo) > > def test_copy_tuple_subclass(self): > class C(tuple): > @@ -604,8 +626,8 @@ > self.assertEqual(tuple(x), ([1, 2], 3)) > y = copy.deepcopy(x) > self.assertEqual(tuple(y), ([1, 2], 3)) > - self.assertTrue(x is not y) > - self.assertTrue(x[0] is not y[0]) > + self.assertIsNot(x, y) > + self.assertIsNot(x[0], y[0]) > > def test_getstate_exc(self): > class EvilState(object): > @@ -633,10 +655,10 @@ > obj = C() > x = weakref.ref(obj) > y = _copy(x) > - self.assertTrue(y is x) > + self.assertIs(y, x) > del obj > y = _copy(x) > - self.assertTrue(y is x) > + self.assertIs(y, x) > > def test_copy_weakref(self): > self._check_weakref(copy.copy) > @@ -652,7 +674,7 @@ > u[a] = b > u[c] = d > v = copy.copy(u) > - self.assertFalse(v is u) > + self.assertIsNot(v, u) > self.assertEqual(v, u) > self.assertEqual(v[a], b) > self.assertEqual(v[c], d) > @@ -682,8 +704,8 @@ > v = copy.deepcopy(u) > self.assertNotEqual(v, u) > self.assertEqual(len(v), 2) > - self.assertFalse(v[a] is b) > - self.assertFalse(v[c] is d) > + self.assertIsNot(v[a], b) > + self.assertIsNot(v[c], d) > self.assertEqual(v[a].i, b.i) > self.assertEqual(v[c].i, d.i) > del c > @@ -702,12 +724,12 @@ > self.assertNotEqual(v, u) > self.assertEqual(len(v), 2) > (x, y), (z, t) = sorted(v.items(), key=lambda pair: pair[0].i) > - self.assertFalse(x is a) > + self.assertIsNot(x, a) > self.assertEqual(x.i, a.i) > - self.assertTrue(y is b) > - self.assertFalse(z is c) > + self.assertIs(y, b) > + self.assertIsNot(z, c) > self.assertEqual(z.i, c.i) > - self.assertTrue(t is d) > + self.assertIs(t, d) > del x, y, z, t > del d > self.assertEqual(len(v), 1) > @@ -720,7 +742,7 @@ > f.b = f.m > g = copy.deepcopy(f) > self.assertEqual(g.m, g.b) > - self.assertTrue(g.b.__self__ is g) > + self.assertIs(g.b.__self__, g) > g.b() > > > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > python-check...@python.org > http://mail.python.org/mailman/listinfo/python-checkins > > _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
