Merge lp:~soren/nova/skip-timing-sensitive-tests into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Skip timing sensitive tests if SKIP_TIMING_SENSITIVE_TESTS is set.

[Brian Lamar (blamar)]

I've fixed ratelimiting in general to not unit test using `time.sleep` anymore. IMO testing with `time.sleep` is a hack and I'd rather see it go away than have this go in. :)

I'll not 'Disapprove' because it would be a bias review based on my branch, but feel free to look over my Limits reworking which improves testability and ensures tests are MUCH faster due to no more sleeps. :)

https://code.launchpad.net/~blamar/nova/lp728587/+merge/53554

[Soren Hansen (soren)]

Avoiding sleeps altogether sounds like a massive win. Let's go with that instead.

Unmerged revisions

802. By Soren Hansen on 2011-03-16

Make timing sensitive test (specifically nova.tests.api.openstack.test_ratelimiting:LimiterTest.test_second) be skipped if SKIP_TIMING_SENSITIVE_TESTS environment is set.

=== modified file 'nova/tests/api/openstack/test_ratelimiting.py'
--- nova/tests/api/openstack/test_ratelimiting.py	2011-02-23 19:56:37 +0000
+++ nova/tests/api/openstack/test_ratelimiting.py	2011-03-16 11:02:54 +0000
@@ -1,5 +1,6 @@
 import httplib
 import StringIO
+import os
 import time
 import webob
 
@@ -31,6 +32,11 @@
             self.assertAlmostEqual(when, delay, 2)
 
     def test_second(self):
+        skip_test_env = os.environ.get('SKIP_TIMING_SENSITIVE_TESTS', False)
+        if skip_test_env:
+            if not (skip_test_env == '0' or skip_test_env == 'no'):
+                return
+
         self.exhaust('a', 5)
         time.sleep(0.2)
         self.exhaust('a', 1)