diff options
| author | Prashanth Pai <ppai@redhat.com> | 2014-01-20 12:56:28 +0530 |
|---|---|---|
| committer | Luis Pabon <lpabon@redhat.com> | 2014-01-21 10:07:52 -0800 |
| commit | 1fe843ba94bc73ebcc022a1038d19e8f374d9ea7 (patch) | |
| tree | 9d9677b7cf342a0bbf92557da80b5cb457ebf772 | |
| parent | d5fe1795d40db8c61c0c84d29a8131600e0986bb (diff) | |
RHEL 6.4 has Python 2.6 which do not contain certain assert
statements present in python 2.7
Change-Id: Ib3c46e5613c0f8270d280d58b5842ffb0a3ab3e2
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Reviewed-on: http://review.gluster.org/6732
Reviewed-by: Chetan Risbud <crisbud@redhat.com>
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
| -rw-r--r-- | test/unit/test_kerbauth.py | 14 | ||||
| -rw-r--r-- | test/unit/test_kerbauth_utils.py | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/unit/test_kerbauth.py b/test/unit/test_kerbauth.py index 207558f..b6e7f51 100644 --- a/test/unit/test_kerbauth.py +++ b/test/unit/test_kerbauth.py @@ -291,9 +291,9 @@ class TestAuth(unittest.TestCase): _mock_run_kinit.assert_called_once_with('user', 'password') self.assertEquals(_mock_get_groups.call_count, 2) self.assertEquals(resp.status_int, 200) - self.assertIsNotNone(resp.headers['X-Auth-Token']) - self.assertIsNotNone(resp.headers['X-Storage-Token']) - self.assertIsNotNone(resp.headers['X-Storage-Url']) + self.assertTrue(resp.headers['X-Auth-Token'] is not None) + self.assertTrue(resp.headers['X-Storage-Token'] is not None) + self.assertTrue(resp.headers['X-Storage-Url'] is not None) def test_passive_handle_get_token_user_invalid_or_no__account(self): #X-Auth-User not in acc:user format @@ -320,7 +320,7 @@ class TestAuth(unittest.TestCase): with patch('swiftkerbauth.kerbauth.run_kinit', _mock_run_kinit): resp = self.test_auth_passive.handle_get_token(req) self.assertEquals(resp.status_int, 500) - self.assertIn("kinit command not found", resp.body) + self.assertTrue("kinit command not found" in resp.body) _mock_run_kinit.assert_called_once_with('user', 'password') def test_passive_handle_get_token_kinit_fail(self): @@ -346,9 +346,9 @@ class TestAuth(unittest.TestCase): _mock_run_kinit.assert_called_once_with('user', 'password') self.assertEquals(_mock_get_groups.call_count, 2) self.assertEquals(resp.status_int, 200) - self.assertIsNotNone(resp.headers['X-Auth-Token']) - self.assertIsNotNone(resp.headers['X-Storage-Token']) - self.assertIsNotNone(resp.headers['X-Storage-Url']) + self.assertTrue(resp.headers['X-Auth-Token'] is not None) + self.assertTrue(resp.headers['X-Storage-Token'] is not None) + self.assertTrue(resp.headers['X-Storage-Url'] is not None) def test_passive_handle_get_token_kinit_realm_and_memcache(self): req = self._make_request('/auth/v1.0', diff --git a/test/unit/test_kerbauth_utils.py b/test/unit/test_kerbauth_utils.py index cb135cf..66b8a4b 100644 --- a/test/unit/test_kerbauth_utils.py +++ b/test/unit/test_kerbauth_utils.py @@ -62,11 +62,11 @@ class TestKerbUtils(unittest.TestCase): def test_generate_token(self): token = ku.generate_token() matches = re.match('AUTH_tk[a-f0-9]{32}', token) - self.assertIsNotNone(matches) + self.assertTrue(matches is not None) def test_get_groups_from_username(self): groups = ku.get_groups_from_username("root") - self.assertIn("root", groups) + self.assertTrue("root" in groups) def test_get_groups_from_username_err(self): try: |