From b6e5a10028551a1c2b1379c5c8ed039582434f25 Mon Sep 17 00:00:00 2001 From: radhika Date: Wed, 20 Apr 2016 18:28:19 -0400 Subject: [PATCH] 8937: test updates --- sdk/python/arvados/keep.py | 4 ++-- sdk/python/tests/test_keep_client.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py index 135d9856e1..8d9cc3b55e 100644 --- a/sdk/python/arvados/keep.py +++ b/sdk/python/arvados/keep.py @@ -432,7 +432,7 @@ class KeepClient(object): _logger.info("HEAD %s: %s bytes", self._result['status_code'], self._result.get('content-length')) - return str(self._result.get('content-length')) + return True _logger.info("GET %s: %s bytes in %s msec (%.3f MiB/sec)", self._result['status_code'], @@ -980,7 +980,7 @@ class KeepClient(object): self.block_cache.cap_cache() if loop.success(): if method == "HEAD": - return "true" + return "True" else: return blob diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py index fa82dcc920..04752a6f0d 100644 --- a/sdk/python/tests/test_keep_client.py +++ b/sdk/python/tests/test_keep_client.py @@ -110,7 +110,7 @@ class KeepTestCase(run_test_server.TestCaseWithServers): locator, '^b9a772c7049325feb7130fff1f8333e9\+9', 'wrong md5 hash from Keep.put for "test_head": ' + locator) - self.assertEqual("true", self.keep_client.head(locator)) + self.assertEqual("True", self.keep_client.head(locator)) self.assertEqual(self.keep_client.get(locator), 'test_head', 'wrong content from Keep.get for "test_head"') @@ -827,7 +827,7 @@ class KeepClientGatewayTestCase(unittest.TestCase, tutil.ApiClientMock): self.assertEqual('foo', self.keepClient.get(locator)) self.assertEqual(self.gateway_roots[0]+locator, MockCurl.return_value.getopt(pycurl.URL)) - self.assertEqual("true", self.keepClient.head(locator)) + self.assertEqual("True", self.keepClient.head(locator)) @mock.patch('pycurl.Curl') def test_get_with_gateway_hints_in_order(self, MockCurl): @@ -893,7 +893,7 @@ class KeepClientGatewayTestCase(unittest.TestCase, tutil.ApiClientMock): code=200, body='foo', headers={'Content-Length': 3}) self.mock_disks_and_gateways() locator = 'acbd18db4cc2f85cedef654fccc4a4d8+3+K@xyzzy' - self.assertEqual("true", self.keepClient.head(locator)) + self.assertEqual("True", self.keepClient.head(locator)) self.assertEqual('https://keep.xyzzy.arvadosapi.com/'+locator, MockCurl.return_value.getopt(pycurl.URL)) @@ -1014,7 +1014,7 @@ class KeepClientRetryGetTestCase(KeepClientRetryTestMixin, unittest.TestCase): @tutil.skip_sleep class KeepClientRetryHeadTestCase(KeepClientRetryTestMixin, unittest.TestCase): - DEFAULT_EXPECT = "true" + DEFAULT_EXPECT = "True" DEFAULT_EXCEPTION = arvados.errors.KeepReadError HINTED_LOCATOR = KeepClientRetryTestMixin.TEST_LOCATOR + '+K@xyzzy' TEST_PATCHER = staticmethod(tutil.mock_keep_responses) -- 2.30.2