Merge "Remove sleep in test_consoleauth."

1 files changed, 13 insertions, 1 deletions

diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py
index 9c6368b4c..1490028ca 100644
--- a/nova/tests/consoleauth/test_consoleauth.py
+++ b/nova/tests/consoleauth/test_consoleauth.py
@@ -20,16 +20,27 @@ Tests for Consoleauth Code.
 
 """
 
+import fixtures
 import time
 
 from nova.consoleauth import manager
 from nova import context
 from nova.openstack.common import log as logging
+from nova.openstack.common import timeutils
 from nova import test
 
 LOG = logging.getLogger(__name__)
 
 
+class TimeOverride(fixtures.Fixture):
+    """Fixture to start and remove time override."""
+
+    def setUp(self):
+        super(TimeOverride, self).setUp()
+        timeutils.set_time_override()
+        self.addCleanup(timeutils.clear_time_override)
+
+
 class ConsoleauthTestCase(test.TestCase):
     """Test Case for consoleauth."""
 
@@ -40,10 +51,11 @@ class ConsoleauthTestCase(test.TestCase):
 
     def test_tokens_expire(self):
         """Test that tokens expire correctly."""
+        self.useFixture(TimeOverride())
         token = 'mytok'
         self.flags(console_token_ttl=1)
         self.manager.authorize_console(self.context, token, 'novnc',
                                        '127.0.0.1', 'host', '')
         self.assertTrue(self.manager.check_token(self.context, token))
-        time.sleep(1.1)
+        timeutils.advance_time_seconds(1)
         self.assertFalse(self.manager.check_token(self.context, token))