Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r57508:d6c016e3e5b1 Date: 2012-09-24 18:06 +0200 http://bitbucket.org/pypy/pypy/changeset/d6c016e3e5b1/
Log: Fix the test by allowing a different exception in two corner error cases. diff --git a/lib-python/2.7/test/test_csv.py b/lib-python/2.7/test/test_csv.py --- a/lib-python/2.7/test/test_csv.py +++ b/lib-python/2.7/test/test_csv.py @@ -59,7 +59,8 @@ self.assertRaises((TypeError, AttributeError), setattr, obj.dialect, 'delimiter', ':') self.assertRaises(AttributeError, delattr, obj.dialect, 'quoting') - self.assertRaises(AttributeError, setattr, obj.dialect, + # PyPy gets a TypeError instead of an AttributeError + self.assertRaises((AttributeError, TypeError), setattr, obj.dialect, 'quoting', None) def test_reader_attrs(self): @@ -133,7 +134,8 @@ os.unlink(name) def test_write_arg_valid(self): - self.assertRaises(csv.Error, self._write_test, None, '') + # PyPy gets a TypeError instead of a csv.Error for "not a sequence" + self.assertRaises((csv.Error, TypeError), self._write_test, None, '') self._write_test((), '') self._write_test([None], '""') self.assertRaises(csv.Error, self._write_test, _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit