merge 3.3 (#20901)

2014-03-12 21:52:19 -05:00 · 2014-03-12 21:52:19 -05:00 · a6d018ad6e
parent 605765fa32 966f2fca5f
commit a6d018ad6e
1 changed files with 1 additions and 1 deletions
--- a/Lib/sqlite3/test/hooks.py
+++ b/Lib/sqlite3/test/hooks.py
@ -162,7 +162,7 @@ class ProgressTests(unittest.TestCase):
            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):
        """