One more test breakage hits the dust. The test was clearly in the wrong.

diff --git a/BROKEN_TESTS b/BROKEN_TESTS
index b217211755b0c88443756643f9f514e0f3ebb479..a14999c9639f8bdbdd4f20c7848b139cee88242d 100644 (file)
--- a/BROKEN_TESTS
+++ b/BROKEN_TESTS
@@ -1,5 +1,4 @@
-test_format -- '%o' % 0 works? ... no # Unexpected  <type 'exceptions.TypeError'> : 'expected string or Unicode object, int found'
 test_pickletools -- Test probably needs to be fixed
 test_repr -- test_numbers() fails
-test_socket -- OverflowError: can't convert negative value to unsigned int
+test_socket -- ntol problems, see SF patch 1635058
 test_sqlite -- CheckLargeInt (sqlite3.test.types.SqliteTypeTests, sqlite3.test.types.DeclTypesTests)

diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
index ace3bc96a250a67b998b040882916aaaa4778123..fc8a5a1b57ec193030b3d0f2660c7d276aefaa4e 100644 (file)
--- a/Lib/test/test_format.py
+++ b/Lib/test/test_format.py
@@ -236,7 +236,7 @@ class Foobar(long):
         return self + 1
 
 test_exc('%o', Foobar(), TypeError,
-         "expected string or Unicode object, long found")
+         "expected string or Unicode object, int found")
 
 if sys.maxint == 2**31-1:
     # crashes 2.2.1 and earlier: