changeset:   89622:4d626a9df062
parent:      89619:6f93ab911d5d
parent:      89621:dbc9e3ed5e9f
user:        Benjamin Peterson <benjamin@python.org>
date:        Wed Mar 12 21:52:19 2014 -0500
description:
merge 3.3 (#20901)


diff -r 6f93ab911d5d -r 4d626a9df062 Lib/sqlite3/test/hooks.py
--- a/Lib/sqlite3/test/hooks.py	Wed Mar 12 21:42:04 2014 -0500
+++ b/Lib/sqlite3/test/hooks.py	Wed Mar 12 21:52:19 2014 -0500
@@ -162,7 +162,7 @@
             create table bar (a, b)
             """)
         second_count = len(progress_calls)
-        self.assertGreater(first_count, second_count)
+        self.assertGreaterEqual(first_count, second_count)
 
     def CheckCancelOperation(self):
         """