From 62b9a0eeeaeb3a5a0daff981cf6fa1cb50e78a50 Mon Sep 17 00:00:00 2001 From: Clay Gerrard Date: Mon, 7 Dec 2015 10:19:51 -0800 Subject: [PATCH] fix mock and assert in test_direct_client Change-Id: Ia6c14377e5dd768a5306a2448f0bf244ebc3634e --- test/unit/common/test_direct_client.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/common/test_direct_client.py b/test/unit/common/test_direct_client.py index 74dee9d4f9..030993cef1 100644 --- a/test/unit/common/test_direct_client.py +++ b/test/unit/common/test_direct_client.py @@ -70,10 +70,10 @@ class FakeConn(object): return self.resp_headers.items() def read(self, amt=None): - if amt is None: - return self.body - elif isinstance(self.body, six.StringIO): + if isinstance(self.body, six.StringIO): return self.body.read(amt) + elif amt is None: + return self.body else: return Exception('Not a StringIO entry') @@ -508,7 +508,7 @@ class TestDirectClient(unittest.TestCase): self.node, self.part, self.account, self.container, self.obj) self.assertEqual(conn.method, 'GET') self.assertEqual(conn.path, self.obj_path) - self.assertEqual(obj_body, contents) + self.assertEqual(obj_body, contents.getvalue()) def test_direct_get_object_error(self): with mocked_http_conn(500) as conn: