X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/009c08b43affdefa6f2825059a971c750b90e222..c3d4f8a585202ec58df5506934b698039c200b68:/sdk/python/tests/test_arvfile.py diff --git a/sdk/python/tests/test_arvfile.py b/sdk/python/tests/test_arvfile.py index 330dd44827..8f02d517fc 100644 --- a/sdk/python/tests/test_arvfile.py +++ b/sdk/python/tests/test_arvfile.py @@ -1,12 +1,12 @@ #!/usr/bin/env python import bz2 +import datetime import gzip import io import mock import os import unittest -import hashlib import time import arvados @@ -29,8 +29,8 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def get_from_cache(self, locator): self.requests.append(locator) return self.blocks.get(locator) - def put(self, data, num_retries=None): - pdh = "%s+%i" % (hashlib.md5(data).hexdigest(), len(data)) + def put(self, data, num_retries=None, copies=None): + pdh = tutil.str_keep_locator(data) self.blocks[pdh] = str(data) return pdh @@ -38,6 +38,11 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def __init__(self, b, r): self.body = b self.response = r + self._schema = ArvadosFileWriterTestCase.MockApi.MockSchema() + self._rootDesc = {} + class MockSchema(object): + def __init__(self): + self.schemas = {'Collection': {'properties': {'replication_desired': {'type':'integer'}}}} class MockCollections(object): def __init__(self, b, r): self.body = b @@ -60,7 +65,8 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def test_truncate(self): keep = ArvadosFileWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}) api = ArvadosFileWriterTestCase.MockApi({"name":"test_truncate", - "manifest_text":". 781e5e245d69b566979b86e28d23f2c7+10 0:8:count.txt\n"}, + "manifest_text":". 781e5e245d69b566979b86e28d23f2c7+10 0:8:count.txt\n", + "replication_desired":None}, {"uuid":"zzzzz-4zz18-mockcollection0", "manifest_text":". 781e5e245d69b566979b86e28d23f2c7+10 0:8:count.txt\n"}) with Collection('. 781e5e245d69b566979b86e28d23f2c7+10 0:10:count.txt\n', @@ -87,7 +93,8 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def test_write_to_end(self): keep = ArvadosFileWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}) api = ArvadosFileWriterTestCase.MockApi({"name":"test_append", - "manifest_text": ". 781e5e245d69b566979b86e28d23f2c7+10 acbd18db4cc2f85cedef654fccc4a4d8+3 0:13:count.txt\n"}, + "manifest_text": ". 781e5e245d69b566979b86e28d23f2c7+10 acbd18db4cc2f85cedef654fccc4a4d8+3 0:13:count.txt\n", + "replication_desired":None}, {"uuid":"zzzzz-4zz18-mockcollection0", "manifest_text": ". 781e5e245d69b566979b86e28d23f2c7+10 acbd18db4cc2f85cedef654fccc4a4d8+3 0:13:count.txt\n"}) with Collection('. 781e5e245d69b566979b86e28d23f2c7+10 0:10:count.txt\n', @@ -223,7 +230,8 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def test_write_large(self): keep = ArvadosFileWriterTestCase.MockKeep({}) api = ArvadosFileWriterTestCase.MockApi({"name":"test_write_large", - "manifest_text": ". a5de24f4417cfba9d5825eadc2f4ca49+67108000 598cc1a4ccaef8ab6e4724d87e675d78+32892000 0:100000000:count.txt\n"}, + "manifest_text": ". a5de24f4417cfba9d5825eadc2f4ca49+67108000 598cc1a4ccaef8ab6e4724d87e675d78+32892000 0:100000000:count.txt\n", + "replication_desired":None}, {"uuid":"zzzzz-4zz18-mockcollection0", "manifest_text": ". a5de24f4417cfba9d5825eadc2f4ca49+67108000 598cc1a4ccaef8ab6e4724d87e675d78+32892000 0:100000000:count.txt\n"}) with Collection('. ' + arvados.config.EMPTY_BLOCK_LOCATOR + ' 0:0:count.txt', @@ -314,7 +322,8 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def test_write_large_rewrite(self): keep = ArvadosFileWriterTestCase.MockKeep({}) api = ArvadosFileWriterTestCase.MockApi({"name":"test_write_large", - "manifest_text": ". 37400a68af9abdd76ca5bf13e819e42a+32892003 a5de24f4417cfba9d5825eadc2f4ca49+67108000 32892000:3:count.txt 32892006:67107997:count.txt 0:32892000:count.txt\n"}, + "manifest_text": ". 37400a68af9abdd76ca5bf13e819e42a+32892003 a5de24f4417cfba9d5825eadc2f4ca49+67108000 32892000:3:count.txt 32892006:67107997:count.txt 0:32892000:count.txt\n", + "replication_desired":None}, {"uuid":"zzzzz-4zz18-mockcollection0", "manifest_text": ". 37400a68af9abdd76ca5bf13e819e42a+32892003 a5de24f4417cfba9d5825eadc2f4ca49+67108000 32892000:3:count.txt 32892006:67107997:count.txt 0:32892000:count.txt\n"}) with Collection('. ' + arvados.config.EMPTY_BLOCK_LOCATOR + ' 0:0:count.txt', @@ -336,7 +345,8 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def test_create(self): keep = ArvadosFileWriterTestCase.MockKeep({}) api = ArvadosFileWriterTestCase.MockApi({"name":"test_create", - "manifest_text":". 2e9ec317e197819358fbc43afca7d837+8 0:8:count.txt\n"}, + "manifest_text":". 2e9ec317e197819358fbc43afca7d837+8 0:8:count.txt\n", + "replication_desired":None}, {"uuid":"zzzzz-4zz18-mockcollection0", "manifest_text":". 2e9ec317e197819358fbc43afca7d837+8 0:8:count.txt\n"}) with Collection(api_client=api, keep_client=keep) as c: @@ -357,7 +367,8 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def test_create_subdir(self): keep = ArvadosFileWriterTestCase.MockKeep({}) api = ArvadosFileWriterTestCase.MockApi({"name":"test_create", - "manifest_text":"./foo/bar 2e9ec317e197819358fbc43afca7d837+8 0:8:count.txt\n"}, + "manifest_text":"./foo/bar 2e9ec317e197819358fbc43afca7d837+8 0:8:count.txt\n", + "replication_desired":None}, {"uuid":"zzzzz-4zz18-mockcollection0", "manifest_text":"./foo/bar 2e9ec317e197819358fbc43afca7d837+8 0:8:count.txt\n"}) with Collection(api_client=api, keep_client=keep) as c: @@ -372,7 +383,8 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def test_overwrite(self): keep = ArvadosFileWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}) api = ArvadosFileWriterTestCase.MockApi({"name":"test_overwrite", - "manifest_text":". 2e9ec317e197819358fbc43afca7d837+8 0:8:count.txt\n"}, + "manifest_text":". 2e9ec317e197819358fbc43afca7d837+8 0:8:count.txt\n", + "replication_desired":None}, {"uuid":"zzzzz-4zz18-mockcollection0", "manifest_text":". 2e9ec317e197819358fbc43afca7d837+8 0:8:count.txt\n"}) with Collection('. 781e5e245d69b566979b86e28d23f2c7+10 0:10:count.txt\n', @@ -401,7 +413,8 @@ class ArvadosFileWriterTestCase(unittest.TestCase): def test_create_multiple(self): keep = ArvadosFileWriterTestCase.MockKeep({}) api = ArvadosFileWriterTestCase.MockApi({"name":"test_create_multiple", - "manifest_text":". 2e9ec317e197819358fbc43afca7d837+8 e8dc4081b13434b45189a720b77b6818+8 0:8:count1.txt 8:8:count2.txt\n"}, + "manifest_text":". 2e9ec317e197819358fbc43afca7d837+8 e8dc4081b13434b45189a720b77b6818+8 0:8:count1.txt 8:8:count2.txt\n", + "replication_desired":None}, {"uuid":"zzzzz-4zz18-mockcollection0", "manifest_text":". 2e9ec317e197819358fbc43afca7d837+8 e8dc4081b13434b45189a720b77b6818+8 0:8:count1.txt 8:8:count2.txt\n"}) with Collection(api_client=api, keep_client=keep) as c: @@ -453,7 +466,7 @@ class ArvadosFileReaderTestCase(StreamFileReaderTestCase): n = 0 blocks = {} for d in ['01234', '34567', '67890']: - loc = '{}+{}'.format(hashlib.md5(d).hexdigest(), len(d)) + loc = tutil.str_keep_locator(d) blocks[loc] = d stream.append(Range(loc, n, len(d))) n += len(d) @@ -558,6 +571,26 @@ class ArvadosFileReadlinesTestCase(ArvadosFileReadTestCase): def read_for_test(self, reader, byte_count, **kwargs): return ''.join(reader.readlines(**kwargs)) + +class ArvadosFileTestCase(unittest.TestCase): + def datetime_to_hex(self, dt): + return hex(int(time.mktime(dt.timetuple())))[2:] + + def test_permission_expired(self): + base_manifest = ". 781e5e245d69b566979b86e28d23f2c7+10+A715fd31f8111894f717eb1003c1b0216799dd9ec@{} 0:10:count.txt\n" + now = datetime.datetime.now() + a_week_ago = now - datetime.timedelta(days=7) + a_month_ago = now - datetime.timedelta(days=30) + a_week_from_now = now + datetime.timedelta(days=7) + with Collection(base_manifest.format(self.datetime_to_hex(a_week_from_now))) as c: + self.assertFalse(c.find('count.txt').permission_expired()) + with Collection(base_manifest.format(self.datetime_to_hex(a_week_ago))) as c: + f = c.find('count.txt') + self.assertTrue(f.permission_expired()) + self.assertTrue(f.permission_expired(a_week_from_now)) + self.assertFalse(f.permission_expired(a_month_ago)) + + class BlockManagerTest(unittest.TestCase): def test_bufferblock_append(self): keep = ArvadosFileWriterTestCase.MockKeep({})