X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7f545f1feabcb30fa0ccb3cab3f46392d01f0fea..404f868129e22cd627d350d61f74806f5b31a8ad:/sdk/python/tests/test_http.py diff --git a/sdk/python/tests/test_http.py b/sdk/python/tests/test_http.py index fa61e9ed8b..bce57eda61 100644 --- a/sdk/python/tests/test_http.py +++ b/sdk/python/tests/test_http.py @@ -21,7 +21,7 @@ import arvados.collection import arvados.keep import pycurl -from arvados.http_import import http_to_keep +from arvados.http_to_keep import http_to_keep import ruamel.yaml as yaml @@ -60,9 +60,9 @@ class CurlMock: self.perform_was_called = True if self.head: - self.headerfn("HTTP/1.1 {} Status".format(self.head_response)) + self.headerfn("HTTP/1.1 {} Status\r\n".format(self.head_response)) else: - self.headerfn("HTTP/1.1 {} Status".format(self.get_response)) + self.headerfn("HTTP/1.1 {} Status\r\n".format(self.get_response)) for k,v in self.headers.items(): self.headerfn("%s: %s" % (k,v)) @@ -97,7 +97,9 @@ class TestHttpToKeep(unittest.TestCase): utcnow.return_value = datetime.datetime(2018, 5, 15) r = http_to_keep(api, None, "http://example.com/file1.txt", utcnow=utcnow) - self.assertEqual(r, "keep:99999999999999999999999999999998+99/file1.txt") + self.assertEqual(r, ("99999999999999999999999999999998+99", "file1.txt", + 'zzzzz-4zz18-zzzzzzzzzzzzzz3', 'http://example.com/file1.txt', + datetime.datetime(2018, 5, 15, 0, 0))) assert mockobj.url == b"http://example.com/file1.txt" assert mockobj.perform_was_called is True @@ -146,7 +148,9 @@ class TestHttpToKeep(unittest.TestCase): utcnow.return_value = datetime.datetime(2018, 5, 16) r = http_to_keep(api, None, "http://example.com/file1.txt", utcnow=utcnow) - self.assertEqual(r, "keep:99999999999999999999999999999998+99/file1.txt") + self.assertEqual(r, ("99999999999999999999999999999998+99", "file1.txt", + 'zzzzz-4zz18-zzzzzzzzzzzzzz3', 'http://example.com/file1.txt', + datetime.datetime(2018, 5, 16, 0, 0))) assert mockobj.perform_was_called is False @@ -185,7 +189,8 @@ class TestHttpToKeep(unittest.TestCase): utcnow.return_value = datetime.datetime(2018, 5, 16) r = http_to_keep(api, None, "http://example.com/file1.txt", utcnow=utcnow) - self.assertEqual(r, "keep:99999999999999999999999999999998+99/file1.txt") + self.assertEqual(r, ("99999999999999999999999999999998+99", "file1.txt", 'zzzzz-4zz18-zzzzzzzzzzzzzz3', + 'http://example.com/file1.txt', datetime.datetime(2018, 5, 16, 0, 0))) assert mockobj.perform_was_called is False @@ -224,7 +229,10 @@ class TestHttpToKeep(unittest.TestCase): utcnow.return_value = datetime.datetime(2018, 5, 17) r = http_to_keep(api, None, "http://example.com/file1.txt", utcnow=utcnow) - self.assertEqual(r, "keep:99999999999999999999999999999997+99/file1.txt") + self.assertEqual(r, ("99999999999999999999999999999997+99", "file1.txt", + 'zzzzz-4zz18-zzzzzzzzzzzzzz4', + 'http://example.com/file1.txt', datetime.datetime(2018, 5, 17, 0, 0))) + assert mockobj.url == b"http://example.com/file1.txt" assert mockobj.perform_was_called is True @@ -278,7 +286,9 @@ class TestHttpToKeep(unittest.TestCase): utcnow.return_value = datetime.datetime(2018, 5, 17) r = http_to_keep(api, None, "http://example.com/file1.txt", utcnow=utcnow) - self.assertEqual(r, "keep:99999999999999999999999999999998+99/file1.txt") + self.assertEqual(r, ("99999999999999999999999999999998+99", "file1.txt", + 'zzzzz-4zz18-zzzzzzzzzzzzzz3', 'http://example.com/file1.txt', + datetime.datetime(2018, 5, 17, 0, 0))) cm.open.assert_not_called() @@ -315,7 +325,10 @@ class TestHttpToKeep(unittest.TestCase): utcnow.return_value = datetime.datetime(2018, 5, 15) r = http_to_keep(api, None, "http://example.com/download?fn=/file1.txt", utcnow=utcnow) - self.assertEqual(r, "keep:99999999999999999999999999999998+99/file1.txt") + self.assertEqual(r, ("99999999999999999999999999999998+99", "file1.txt", + 'zzzzz-4zz18-zzzzzzzzzzzzzz3', + 'http://example.com/download?fn=/file1.txt', + datetime.datetime(2018, 5, 15, 0, 0))) assert mockobj.url == b"http://example.com/download?fn=/file1.txt" @@ -369,7 +382,9 @@ class TestHttpToKeep(unittest.TestCase): utcnow.return_value = datetime.datetime(2018, 5, 17) r = http_to_keep(api, None, "http://example.com/file1.txt", utcnow=utcnow) - self.assertEqual(r, "keep:99999999999999999999999999999998+99/file1.txt") + self.assertEqual(r, ("99999999999999999999999999999998+99", "file1.txt", + 'zzzzz-4zz18-zzzzzzzzzzzzzz3', 'http://example.com/file1.txt', + datetime.datetime(2018, 5, 17, 0, 0))) print(mockobj.req_headers) assert mockobj.req_headers == ["Accept: application/octet-stream", "If-None-Match: \"123456\""] @@ -418,7 +433,8 @@ class TestHttpToKeep(unittest.TestCase): utcnow.return_value = datetime.datetime(2018, 5, 17) r = http_to_keep(api, None, "http://example.com/file1.txt", utcnow=utcnow, prefer_cached_downloads=True) - self.assertEqual(r, "keep:99999999999999999999999999999998+99/file1.txt") + self.assertEqual(r, ("99999999999999999999999999999998+99", "file1.txt", 'zzzzz-4zz18-zzzzzzzzzzzzzz3', + 'http://example.com/file1.txt', datetime.datetime(2018, 5, 17, 0, 0))) assert mockobj.perform_was_called is False cm.open.assert_not_called() @@ -465,7 +481,8 @@ class TestHttpToKeep(unittest.TestCase): r = http_to_keep(api, None, "http://example.com/file1.txt?KeyId=123&Signature=456&Expires=789", utcnow=utcnow, varying_url_params="KeyId,Signature,Expires") - self.assertEqual(r, "keep:99999999999999999999999999999998+99/file1.txt") + self.assertEqual(r, ("99999999999999999999999999999998+99", "file1.txt", 'zzzzz-4zz18-zzzzzzzzzzzzzz3', + 'http://example.com/file1.txt', datetime.datetime(2018, 5, 17, 0, 0))) assert mockobj.perform_was_called is True cm.open.assert_not_called()