diff options
| author | rico.lin <rico.lin.guanyu@gmail.com> | 2015-07-10 22:28:49 +0800 |
|---|---|---|
| committer | rico.lin <rico.lin.guanyu@gmail.com> | 2015-07-14 18:51:58 +0800 |
| commit | 953f76650e084f5678efb5529d00b3b4b79eb2ff (patch) | |
| tree | 43803a7e134738d396416a8cd65567b515643b50 | |
| parent | f860668d7146bc5cd1b9914ea15ad5d6f0dd9585 (diff) | |
| download | python-cinderclient-953f76650e084f5678efb5529d00b3b4b79eb2ff.tar.gz | |
New mock release(1.1.0) broke unit/function tests
Change-Id: Ia84c667b65fb69ba877bdb0ecb45827281539e03
Closes-Bug: #1473454
| -rw-r--r-- | cinderclient/tests/unit/test_shell.py | 2 | ||||
| -rw-r--r-- | cinderclient/tests/unit/v1/test_auth.py | 6 | ||||
| -rw-r--r-- | cinderclient/tests/unit/v2/test_auth.py | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/cinderclient/tests/unit/test_shell.py b/cinderclient/tests/unit/test_shell.py index 1754291..a1a1964 100644 --- a/cinderclient/tests/unit/test_shell.py +++ b/cinderclient/tests/unit/test_shell.py @@ -167,7 +167,7 @@ class ShellTest(utils.TestCase): token_url = _shell.cs.client.auth_url + "/tokens" self.assertEqual(non_keystone_auth_url + "/tokens", token_url) - mock_request.assert_any_called( + mock_request.assert_any_call( "POST", token_url, headers=headers, diff --git a/cinderclient/tests/unit/v1/test_auth.py b/cinderclient/tests/unit/v1/test_auth.py index 5864b96..7e5b901 100644 --- a/cinderclient/tests/unit/v1/test_auth.py +++ b/cinderclient/tests/unit/v1/test_auth.py @@ -322,8 +322,8 @@ class AuthenticationTests(utils.TestCase): @mock.patch.object(http_client, 'authenticate') def test_auth_call(m): http_client.get('/') - m.assert_called() - mock_request.assert_called() + self.assertTrue(m.called) + self.assertTrue(mock_request.called) test_auth_call() @@ -333,6 +333,6 @@ class AuthenticationTests(utils.TestCase): @mock.patch.object(cs.client, 'authenticate') def test_auth_call(m): cs.authenticate() - m.assert_called() + self.assertTrue(m.called) test_auth_call() diff --git a/cinderclient/tests/unit/v2/test_auth.py b/cinderclient/tests/unit/v2/test_auth.py index 9e97846..4caf2eb 100644 --- a/cinderclient/tests/unit/v2/test_auth.py +++ b/cinderclient/tests/unit/v2/test_auth.py @@ -325,8 +325,8 @@ class AuthenticationTests(utils.TestCase): @mock.patch.object(http_client, 'authenticate') def test_auth_call(m): http_client.get('/') - m.assert_called() - mock_request.assert_called() + self.assertTrue(m.called) + self.assertTrue(mock_request.called) test_auth_call() @@ -336,6 +336,6 @@ class AuthenticationTests(utils.TestCase): @mock.patch.object(cs.client, 'authenticate') def test_auth_call(m): cs.authenticate() - m.assert_called() + self.assertTrue(m.called) test_auth_call() diff --git a/test-requirements.txt b/test-requirements.txt index 4c920bb..c7c16b4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,8 @@ hacking<0.11,>=0.10.0 coverage>=3.6 discover fixtures>=1.3.1 -mock>=1.0 +mock>=1.1;python_version!='2.6' +mock==1.0.1;python_version=='2.6' oslosphinx>=2.5.0 # Apache-2.0 python-subunit>=0.0.18 requests-mock>=0.6.0 # Apache-2.0 |