summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-05-28 03:23:20 +0000
committerGerrit Code Review <review@openstack.org>2014-05-28 03:23:20 +0000
commit3d0de79e26e2aa6285742c60aca3c164e9c2fbb9 (patch)
tree393513fcd609ad153dbb747b934e52fee786a76b
parenta0307347013f6c12d89c0874bd715b31df780bb6 (diff)
parent569bbc723ec761efc8d5b32f84e2cb4dccb2b3a7 (diff)
downloadpython-swiftclient-3d0de79e26e2aa6285742c60aca3c164e9c2fbb9.tar.gz
Merge "change assertEquals to assertEqual"
-rw-r--r--tests/unit/test_swiftclient.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit/test_swiftclient.py b/tests/unit/test_swiftclient.py
index 35f673a..283400e 100644
--- a/tests/unit/test_swiftclient.py
+++ b/tests/unit/test_swiftclient.py
@@ -824,8 +824,8 @@ class TestHTTPConnection(MockHttpTest):
def test_ok_proxy(self):
conn = c.http_connection(u'http://www.test.com/',
proxy='http://localhost:8080')
- self.assertEquals(conn[1].requests_args['proxies']['http'],
- 'http://localhost:8080')
+ self.assertEqual(conn[1].requests_args['proxies']['http'],
+ 'http://localhost:8080')
def test_bad_proxy(self):
try:
@@ -836,11 +836,11 @@ class TestHTTPConnection(MockHttpTest):
def test_cacert(self):
conn = c.http_connection(u'http://www.test.com/',
cacert='/dev/urandom')
- self.assertEquals(conn[1].requests_args['verify'], '/dev/urandom')
+ self.assertEqual(conn[1].requests_args['verify'], '/dev/urandom')
def test_insecure(self):
conn = c.http_connection(u'http://www.test.com/', insecure=True)
- self.assertEquals(conn[1].requests_args['verify'], False)
+ self.assertEqual(conn[1].requests_args['verify'], False)
class TestConnection(MockHttpTest):