summaryrefslogtreecommitdiff
path: root/tests/unit/test_swiftclient.py
diff options
context:
space:
mode:
authorHiroshi Miura <miurahr@nttdata.co.jp>2015-08-03 12:20:44 +0900
committerHiroshi Miura <miurahr@nttdata.co.jp>2015-08-06 18:50:33 +0900
commitbe0f1aad8a5ed6f8d61016902c713db609ad834c (patch)
tree59736094c2439b6238b4e888b8d1d287db1db7b0 /tests/unit/test_swiftclient.py
parenta056f1b3742812a2c861a0d01678dfed3b0087e4 (diff)
downloadpython-swiftclient-be0f1aad8a5ed6f8d61016902c713db609ad834c.tar.gz
change deprecated assertEquals to assertEqual
fix against H234: assertEquals() logs a DeprecationWarning in Python3.x. use assertEqual() instead. Closes-bug: #1480776 Change-Id: Iffda6bb5f2616d4af4567eeea37bb26531e34371 Signed-off-by: Hiroshi Miura <miurahr@nttdata.co.jp>
Diffstat (limited to 'tests/unit/test_swiftclient.py')
-rw-r--r--tests/unit/test_swiftclient.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/unit/test_swiftclient.py b/tests/unit/test_swiftclient.py
index 1cfe204..bd5281f 100644
--- a/tests/unit/test_swiftclient.py
+++ b/tests/unit/test_swiftclient.py
@@ -693,9 +693,9 @@ class TestGetObject(MockHttpTest):
c.http_connection = self.fake_http_connection(200, body='abcde')
__, resp = conn.get_object('asdf', 'asdf', resp_chunk_size=3)
self.assertTrue(hasattr(resp, 'read'))
- self.assertEquals(resp.read(3), 'abc')
- self.assertEquals(resp.read(None), 'de')
- self.assertEquals(resp.read(), '')
+ self.assertEqual(resp.read(3), 'abc')
+ self.assertEqual(resp.read(None), 'de')
+ self.assertEqual(resp.read(), '')
def test_chunk_size_iter(self):
conn = c.Connection('http://auth.url/', 'some_user', 'some_key')
@@ -704,8 +704,8 @@ class TestGetObject(MockHttpTest):
c.http_connection = self.fake_http_connection(200, body='abcde')
__, resp = conn.get_object('asdf', 'asdf', resp_chunk_size=3)
self.assertTrue(hasattr(resp, 'next'))
- self.assertEquals(next(resp), 'abc')
- self.assertEquals(next(resp), 'de')
+ self.assertEqual(next(resp), 'abc')
+ self.assertEqual(next(resp), 'de')
self.assertRaises(StopIteration, next, resp)
def test_chunk_size_read_and_iter(self):
@@ -715,11 +715,11 @@ class TestGetObject(MockHttpTest):
c.http_connection = self.fake_http_connection(200, body='abcdef')
__, resp = conn.get_object('asdf', 'asdf', resp_chunk_size=2)
self.assertTrue(hasattr(resp, 'read'))
- self.assertEquals(resp.read(3), 'abc')
- self.assertEquals(next(resp), 'de')
- self.assertEquals(resp.read(), 'f')
+ self.assertEqual(resp.read(3), 'abc')
+ self.assertEqual(next(resp), 'de')
+ self.assertEqual(resp.read(), 'f')
self.assertRaises(StopIteration, next, resp)
- self.assertEquals(resp.read(), '')
+ self.assertEqual(resp.read(), '')
class TestHeadObject(MockHttpTest):
@@ -871,9 +871,9 @@ class TestPutObject(MockHttpTest):
contents=contents,
chunk_size=chunk_size)
- self.assertNotEquals(etag, contents.get_md5sum())
- self.assertEquals(etag, 'badresponseetag')
- self.assertEquals(raw_data_md5, contents.get_md5sum())
+ self.assertNotEqual(etag, contents.get_md5sum())
+ self.assertEqual(etag, 'badresponseetag')
+ self.assertEqual(raw_data_md5, contents.get_md5sum())
def test_md5_match(self):
conn = c.http_connection('http://www.test.com')
@@ -896,8 +896,8 @@ class TestPutObject(MockHttpTest):
contents=contents,
chunk_size=chunk_size)
- self.assertEquals(raw_data_md5, contents.get_md5sum())
- self.assertEquals(etag, contents.get_md5sum())
+ self.assertEqual(raw_data_md5, contents.get_md5sum())
+ self.assertEqual(etag, contents.get_md5sum())
def test_params(self):
conn = c.http_connection(u'http://www.test.com/')