3551: When testing keep clients, write keepstore/keepproxy logs to

[arvados.git] / sdk / python / tests / test_keep_client.py

diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py
index f5ab6148d06bcb59307f38223060c8c62550ed97..8706e2193b7c3f249db3778c03b7ee598269b364 100644 (file)
--- a/sdk/python/tests/test_keep_client.py
+++ b/sdk/python/tests/test_keep_client.py
@@ -36,9 +36,10 @@ class KeepTestCase(unittest.TestCase):
 
     def test_KeepBasicRWTest(self):
         foo_locator = arvados.Keep.put('foo')
-        self.assertEqual(foo_locator,
-                         'acbd18db4cc2f85cedef654fccc4a4d8+3',
-                         'wrong md5 hash from Keep.put("foo"): ' + foo_locator)
+        self.assertRegexpMatches(
+            foo_locator,
+            '^acbd18db4cc2f85cedef654fccc4a4d8\+3',
+            'wrong md5 hash from Keep.put("foo"): ' + foo_locator)
         self.assertEqual(arvados.Keep.get(foo_locator),
                          'foo',
                          'wrong content from Keep.get(md5("foo"))')
@@ -46,10 +47,10 @@ class KeepTestCase(unittest.TestCase):
     def test_KeepBinaryRWTest(self):
         blob_str = '\xff\xfe\xf7\x00\x01\x02'
         blob_locator = arvados.Keep.put(blob_str)
-        self.assertEqual(blob_locator,
-                         '7fc7c53b45e53926ba52821140fef396+6',
-                         ('wrong locator from Keep.put(<binarydata>):' +
-                          blob_locator))
+        self.assertRegexpMatches(
+            blob_locator,
+            '^7fc7c53b45e53926ba52821140fef396\+6',
+            ('wrong locator from Keep.put(<binarydata>):' + blob_locator))
         self.assertEqual(arvados.Keep.get(blob_locator),
                          blob_str,
                          'wrong content from Keep.get(md5(<binarydata>))')
@@ -59,10 +60,10 @@ class KeepTestCase(unittest.TestCase):
         for i in range(0,23):
             blob_str = blob_str + blob_str
         blob_locator = arvados.Keep.put(blob_str)
-        self.assertEqual(blob_locator,
-                         '84d90fc0d8175dd5dcfab04b999bc956+67108864',
-                         ('wrong locator from Keep.put(<binarydata>): ' +
-                          blob_locator))
+        self.assertRegexpMatches(
+            blob_locator,
+            '^84d90fc0d8175dd5dcfab04b999bc956\+67108864',
+            ('wrong locator from Keep.put(<binarydata>): ' + blob_locator))
         self.assertEqual(arvados.Keep.get(blob_locator),
                          blob_str,
                          'wrong content from Keep.get(md5(<binarydata>))')
@@ -70,10 +71,10 @@ class KeepTestCase(unittest.TestCase):
     def test_KeepSingleCopyRWTest(self):
         blob_str = '\xff\xfe\xfd\xfc\x00\x01\x02\x03'
         blob_locator = arvados.Keep.put(blob_str, copies=1)
-        self.assertEqual(blob_locator,
-                         'c902006bc98a3eb4a3663b65ab4a6fab+8',
-                         ('wrong locator from Keep.put(<binarydata>): ' +
-                          blob_locator))
+        self.assertRegexpMatches(
+            blob_locator,
+            '^c902006bc98a3eb4a3663b65ab4a6fab\+8',
+            ('wrong locator from Keep.put(<binarydata>): ' + blob_locator))
         self.assertEqual(arvados.Keep.get(blob_locator),
                          blob_str,
                          'wrong content from Keep.get(md5(<binarydata>))')
@@ -249,9 +250,10 @@ class KeepProxyTestCase(unittest.TestCase):
         arvados.config._settings = None
 
         baz_locator = arvados.Keep.put('baz')
-        self.assertEqual(baz_locator,
-                         '73feffa4b7f6bb68e44cf984c85f6e88+3',
-                         'wrong md5 hash from Keep.put("baz"): ' + baz_locator)
+        self.assertRegexpMatches(
+            baz_locator,
+            '^73feffa4b7f6bb68e44cf984c85f6e88\+3',
+            'wrong md5 hash from Keep.put("baz"): ' + baz_locator)
         self.assertEqual(arvados.Keep.get(baz_locator),
                          'baz',
                          'wrong content from Keep.get(md5("baz"))')
@@ -271,9 +273,10 @@ class KeepProxyTestCase(unittest.TestCase):
         # keep_services/accessible
 
         baz_locator = arvados.Keep.put('baz2')
-        self.assertEqual(baz_locator,
-                         '91f372a266fe2bf2823cb8ec7fda31ce+4',
-                         'wrong md5 hash from Keep.put("baz2"): ' + baz_locator)
+        self.assertRegexpMatches(
+            baz_locator,
+            '^91f372a266fe2bf2823cb8ec7fda31ce\+4',
+            'wrong md5 hash from Keep.put("baz2"): ' + baz_locator)
         self.assertEqual(arvados.Keep.get(baz_locator),
                          'baz2',
                          'wrong content from Keep.get(md5("baz2"))')