commit acee202b28ba7ce1fd9af9a251dedcabf6fa7c38
author Jenkins <jenkins@review.openstack.org> Mon Jun 23 05:28:26 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jun 23 05:28:26 2014 +0000
tree 4d3abb345c421cdfc609e9178ab665c6fd0106a9
parent 18231ce45b9b76ab34daa8fb5dd3f24ed0d24755
parent a51495806caa9e409a31b1d9be3d5df819e1c972

Merge "Remove assertTrue from ssh unit tests"

tempest/tests/test_ssh.py

diff --git a/tempest/tests/test_ssh.py b/tempest/tests/test_ssh.py
index 0da52dc..bf1f553 100644
--- a/tempest/tests/test_ssh.py
+++ b/tempest/tests/test_ssh.py
@@ -90,8 +90,8 @@
         start_time = int(time.time())
         client._get_ssh_connection(sleep=1)
         end_time = int(time.time())
-        self.assertTrue((end_time - start_time) < 3)
-        self.assertTrue((end_time - start_time) > 1)
+        self.assertLess((end_time - start_time), 4)
+        self.assertGreater((end_time - start_time), 1)
 
     def test_get_ssh_connection_timeout(self):
         c_mock, aa_mock, client_mock = self._set_ssh_connection_mocks()
@@ -108,8 +108,8 @@
         with testtools.ExpectedException(exceptions.SSHTimeout):
             client._get_ssh_connection()
         end_time = int(time.time())
-        self.assertTrue((end_time - start_time) < 4)
-        self.assertTrue((end_time - start_time) >= 2)
+        self.assertLess((end_time - start_time), 5)
+        self.assertGreaterEqual((end_time - start_time), 2)
 
     def test_exec_command(self):
         gsc_mock = self.patch('tempest.common.ssh.Client._get_ssh_connection')