X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4609a76d9b84e0f63233cdf6dcbef376b1686b69..4d0d27f83183b6659a570ae1fc07f95aefe0b23e:/sdk/python/tests/test_keep_locator.py

diff --git a/sdk/python/tests/test_keep_locator.py b/sdk/python/tests/test_keep_locator.py
index e9d635673c..4c3d920f7b 100644
--- a/sdk/python/tests/test_keep_locator.py
+++ b/sdk/python/tests/test_keep_locator.py
@@ -1,6 +1,7 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
+from builtins import next
+from builtins import zip
+from builtins import str
+from builtins import range
 import datetime
 import itertools
 import random
@@ -8,13 +9,13 @@ import unittest
 
 from arvados.keep import KeepLocator
 
-class ArvadosPutResumeCacheTest(unittest.TestCase):
+class ArvadosKeepLocatorTest(unittest.TestCase):
     DEFAULT_TEST_COUNT = 10
 
     def numstrs(fmtstr, base, exponent):
         def genstrs(self, count=None):
             return (fmtstr.format(random.randint(0, base ** exponent))
-                    for c in xrange(count or self.DEFAULT_TEST_COUNT))
+                    for c in range(count or self.DEFAULT_TEST_COUNT))
         return genstrs
 
     checksums = numstrs('{:032x}', 16, 32)
@@ -22,17 +23,21 @@ class ArvadosPutResumeCacheTest(unittest.TestCase):
     signatures = numstrs('{:040x}', 16, 40)
     timestamps = numstrs('{:08x}', 16, 8)
 
+    def base_locators(self, count=DEFAULT_TEST_COUNT):
+        return ('+'.join(pair) for pair in
+                zip(self.checksums(count), self.sizes(count)))
+
     def perm_hints(self, count=DEFAULT_TEST_COUNT):
-        for sig, ts in itertools.izip(self.signatures(count),
+        for sig, ts in zip(self.signatures(count),
                                       self.timestamps(count)):
             yield 'A{}@{}'.format(sig, ts)
 
     def test_good_locators_returned(self):
-        for hint_gens in [(), (self.sizes(),), (self.perm_hints(),),
+        for hint_gens in [(), (self.sizes(),),
                           (self.sizes(), self.perm_hints())]:
-            for loc_data in itertools.izip(self.checksums(), *hint_gens):
+            for loc_data in zip(self.checksums(), *hint_gens):
                 locator = '+'.join(loc_data)
-                self.assertEquals(locator, str(KeepLocator(locator)))
+                self.assertEqual(locator, str(KeepLocator(locator)))
 
     def test_nonchecksum_rejected(self):
         for badstr in ['', 'badbadbad', '8f9e68d957b504a29ba76c526c3145dj',
@@ -40,24 +45,41 @@ class ArvadosPutResumeCacheTest(unittest.TestCase):
                        '3+8f9e68d957b504a29ba76c526c3145d9']:
             self.assertRaises(ValueError, KeepLocator, badstr)
 
+    def test_unknown_hints_accepted(self):
+        base = next(self.base_locators(1))
+        for weirdhint in ['Zfoo', 'Ybar234', 'Xa@b_c-372', 'W99']:
+            locator = '+'.join([base, weirdhint])
+            self.assertEqual(locator, str(KeepLocator(locator)))
+
     def test_bad_hints_rejected(self):
-        checksum = next(self.checksums(1))
-        for badhint in ['', 'nonsense', '+32', checksum]:
+        base = next(self.base_locators(1))
+        for badhint in ['', 'A', 'lowercase', '+32']:
             self.assertRaises(ValueError, KeepLocator,
-                              '+'.join([checksum, badhint]))
+                              '+'.join([base, badhint]))
+
+    def test_multiple_locator_hints_accepted(self):
+        base = next(self.base_locators(1))
+        for loc_hints in itertools.permutations(['Kab1cd', 'Kef2gh', 'Kij3kl']):
+            locator = '+'.join((base,) + loc_hints)
+            self.assertEqual(locator, str(KeepLocator(locator)))
+
+    def test_str_type(self):
+        base = next(self.base_locators(1))
+        locator = KeepLocator(base)
+        self.assertEqual(type(''), type(locator.__str__()))
 
     def test_expiry_passed(self):
-        checksum = next(self.checksums(1))
+        base = next(self.base_locators(1))
         signature = next(self.signatures(1))
         dt1980 = datetime.datetime(1980, 1, 1)
         dt2000 = datetime.datetime(2000, 2, 2)
         dt2080 = datetime.datetime(2080, 3, 3)
-        locator = KeepLocator(checksum)
+        locator = KeepLocator(base)
         self.assertFalse(locator.permission_expired())
         self.assertFalse(locator.permission_expired(dt1980))
         self.assertFalse(locator.permission_expired(dt2080))
         # Timestamped to 1987-01-05 18:48:32.
-        locator = KeepLocator('{}+A{}@20000000'.format(checksum, signature))
+        locator = KeepLocator('{}+A{}@20000000'.format(base, signature))
         self.assertTrue(locator.permission_expired())
         self.assertTrue(locator.permission_expired(dt2000))
         self.assertFalse(locator.permission_expired(dt1980))