openstack/python-swiftclient
Code Issues Proposed changes

Merge "change assertEquals to assertEqual"

Browse Source
This commit is contained in:
Jenkins
2014-05-28 03:23:20 +00:00
committed by Gerrit Code Review
parent a030734701 569bbc723e
commit 3d0de79e26
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit/test_swiftclient.py
View File

@@ -824,7 +824,7 @@ class TestHTTPConnection(MockHttpTest):
def test_ok_proxy(self): def test_ok_proxy(self):
conn = c.http_connection(u'http://www.test.com/', conn = c.http_connection(u'http://www.test.com/',
proxy='http://localhost:8080') proxy='http://localhost:8080')
self.assertEquals(conn[1].requests_args['proxies']['http'], self.assertEqual(conn[1].requests_args['proxies']['http'],
'http://localhost:8080') 'http://localhost:8080')
def test_bad_proxy(self): def test_bad_proxy(self):
@@ -836,11 +836,11 @@ class TestHTTPConnection(MockHttpTest):
def test_cacert(self): def test_cacert(self):
conn = c.http_connection(u'http://www.test.com/', conn = c.http_connection(u'http://www.test.com/',
cacert='/dev/urandom') 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): def test_insecure(self):
conn = c.http_connection(u'http://www.test.com/', insecure=True) 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): class TestConnection(MockHttpTest):