From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 27 Jun 2014 16:16:05 +0000 (-0400)
Subject: Fix tests broken by adding zero-length block manifests containing a zero length
X-Git-Tag: 1.1.0~2517
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/826a893776dccc6c491037831e91cdd3ecfce37f

Fix tests broken by adding zero-length block manifests containing a zero length
file.  refs #3084
---

diff --git a/sdk/python/tests/test_arv_put.py b/sdk/python/tests/test_arv_put.py
index 4687b4e0b6..e0f32153d4 100644
--- a/sdk/python/tests/test_arv_put.py
+++ b/sdk/python/tests/test_arv_put.py
@@ -213,12 +213,12 @@ class ArvadosPutCollectionWriterTest(ArvadosKeepLocalStoreTestCase):
         cwriter.write_file('/dev/null')
         cwriter.cache_state()
         self.assertTrue(self.cache.load())
-        self.assertEquals(". 0:0:null\n", cwriter.manifest_text())
+        self.assertEquals(". d41d8cd98f00b204e9800998ecf8427e+0 0:0:null\n", cwriter.manifest_text())
 
     def test_writer_works_without_cache(self):
         cwriter = arv_put.ArvPutCollectionWriter()
         cwriter.write_file('/dev/null')
-        self.assertEquals(". 0:0:null\n", cwriter.manifest_text())
+        self.assertEquals(". d41d8cd98f00b204e9800998ecf8427e+0 0:0:null\n", cwriter.manifest_text())
 
     def test_writer_resumes_from_cache(self):
         cwriter = arv_put.ArvPutCollectionWriter(self.cache)
@@ -237,12 +237,12 @@ class ArvadosPutCollectionWriterTest(ArvadosKeepLocalStoreTestCase):
             cwriter.write_file(testfile.name, 'test')
         new_writer = arv_put.ArvPutCollectionWriter.from_cache(self.cache)
         new_writer.write_file('/dev/null')
-        self.assertEquals(". 0:0:null\n", new_writer.manifest_text())
+        self.assertEquals(". d41d8cd98f00b204e9800998ecf8427e+0 0:0:null\n", new_writer.manifest_text())
 
     def test_new_writer_from_empty_cache(self):
         cwriter = arv_put.ArvPutCollectionWriter.from_cache(self.cache)
         cwriter.write_file('/dev/null')
-        self.assertEquals(". 0:0:null\n", cwriter.manifest_text())
+        self.assertEquals(". d41d8cd98f00b204e9800998ecf8427e+0 0:0:null\n", cwriter.manifest_text())
 
     def test_writer_resumable_after_arbitrary_bytes(self):
         cwriter = arv_put.ArvPutCollectionWriter(self.cache)
diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index d867f7ba93..7483ba06ff 100644
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@ -127,7 +127,7 @@ class ArvadosCollectionsTest(ArvadosKeepLocalStoreTestCase):
         cw.start_new_file('zero.txt')
         cw.write('')
 
-        self.assertEqual(cw.manifest_text(), ". 0:0:zero.txt\n")
+        self.assertEqual(cw.manifest_text(), ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:zero.txt\n")
         self.check_manifest_file_sizes(cw.manifest_text(), [0])
         cw = arvados.CollectionWriter()
         cw.start_new_file('zero.txt')