Don't sleep when replaying recorded data

diff --git a/tests/config.py b/tests/config.py
index 3f8c24c5429efe6b7c9da072e50d44fc5d55d77c..165909da69e3d76f08f3aee3f7dc36111087a0b9 100644 (file)
--- a/tests/config.py
+++ b/tests/config.py
@@ -33,7 +33,7 @@ class TweepyTestCase(unittest.TestCase):
         self.auth = create_auth()
         self.api = API(self.auth)
         self.api.retry_count = 2
-        self.api.retry_delay = 5
+        self.api.retry_delay = 0 if use_replay else 5
 
 
 def create_auth():

diff --git a/tests/test_api.py b/tests/test_api.py
index e38c4a0728ba3bc6df2d9aa98fd307186601943c..db3b298403f9edcc2326f1ec8a066248690398a5 100644 (file)
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1,7 +1,7 @@
 import unittest
 import random
 import shutil
-from time import sleep
+import time
 import os
 from ast import literal_eval
 
@@ -440,7 +440,7 @@ class TweepyAPITests(TweepyTestCase):
 
 
 class TweepyCacheTests(unittest.TestCase):
-    timeout = 2.0
+    timeout = 0.5
     memcache_servers = ['127.0.0.1:11211']  # must be running for test to pass
 
     def _run_tests(self, do_cleanup=True):
@@ -450,14 +450,14 @@ class TweepyCacheTests(unittest.TestCase):
             'Stored value does not match retrieved value')
 
         # test timeout
-        sleep(self.timeout)
+        sleep(self.timeout, True)
         self.assertEqual(self.cache.get('testkey'), None,
             'Cache entry should have expired')
 
         # test cleanup
         if do_cleanup:
             self.cache.store('testkey', 'testvalue')
-            sleep(self.timeout)
+            sleep(self.timeout, True)
             self.cache.cleanup()
             self.assertEqual(self.cache.count(), 0, 'Cache cleanup failed')
 
@@ -484,6 +484,11 @@ class TweepyCacheTests(unittest.TestCase):
             if os.path.exists('cache_test_dir'):
                 shutil.rmtree('cache_test_dir')
 
+old_sleep = time.sleep
+
+def sleep(t, override=False):
+    if not use_replay or override:
+        old_sleep(t)
 
 if __name__ == '__main__':
     unittest.main()