[py-svn] py-trunk commit 6813b0f3f027: fix test on python2.4

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Mon Jul 26 13:35:23 CEST 2010


# HG changeset patch -- Bitbucket.org
# Project py-trunk
# URL http://bitbucket.org/hpk42/py-trunk/overview
# User holger krekel <holger at merlinux.eu>
# Date 1280144099 -7200
# Node ID 6813b0f3f027f448e3487f0e77cba4fccd78aa6a
# Parent  4e54c87c51398260acd559ce8aabf2183ed79552
fix test on python2.4

--- a/testing/io_/test_terminalwriter.py
+++ b/testing/io_/test_terminalwriter.py
@@ -13,7 +13,7 @@ def test_getdimensions(monkeypatch):
     monkeypatch.setattr(fcntl, 'ioctl', lambda *args: l.append(args))
     try:
         terminalwriter._getdimensions()
-    except struct.error:
+    except (TypeError, struct.error):
         pass
     assert len(l) == 1
     assert l[0][0] == 1



More information about the pytest-commit mailing list