[ARVADOS] updated: ce2362b3b62ccb8fe2e5db5a2b87e9a6212ed86b

[git at public.curoverse.com]

Summary of changes:
 sdk/python/tests/test_collections.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  discards  035183bb343d4944eb05b8f4826025d982322a9c (commit)
       via  ce2362b3b62ccb8fe2e5db5a2b87e9a6212ed86b (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (035183bb343d4944eb05b8f4826025d982322a9c)
            \
             N -- N -- N (ce2362b3b62ccb8fe2e5db5a2b87e9a6212ed86b)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ce2362b3b62ccb8fe2e5db5a2b87e9a6212ed86b
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Oct 31 19:46:26 2014 -0400

    3706: Clarify test case.

diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index df8ba38..c0ef118 100644
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@ -8,6 +8,7 @@ import copy
 import mock
 import os
 import pprint
+import re
 import subprocess
 import tempfile
 import unittest
@@ -770,19 +771,22 @@ class CollectionReaderTestCase(unittest.TestCase, CollectionTestMixin):
         # client should be able to use CollectionReader on a manifest without normalizing it
         client = self.api_client_mock(500)
         nonnormal = ". acbd18db4cc2f85cedef654fccc4a4d8+3+Aabadbadbee at abeebdee 0:3:foo.txt 1:0:bar.txt 0:3:foo.txt\n"
+        reader = arvados.CollectionReader(
+            nonnormal,
+            api_client=client, num_retries=0)
+        # Ensure stripped_manifest() doesn't mangle our manifest in
+        # any way other than stripping hints.
         self.assertEqual(
-            ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo.txt 1:0:bar.txt 0:3:foo.txt\n",
-            arvados.CollectionReader(
-                nonnormal,
-                api_client=client, num_retries=0).stripped_manifest())
+            re.sub('\+[^\d\s\+]+', '', nonnormal),
+            reader.stripped_manifest())
+        # Ensure stripped_manifest() didn't mutate our reader.
+        self.assertEqual(nonnormal, reader.manifest_text())
+        # Ensure the files appear in the order given in the manifest.
         self.assertEqual(
             [[6, '.', 'foo.txt'],
              [0, '.', 'bar.txt']],
             [[f.size(), f.stream_name(), f.name()]
-             for f in
-             arvados.CollectionReader(
-                    nonnormal,
-                    api_client=client, num_retries=0).all_streams()[0].all_files()])
+             for f in reader.all_streams()[0].all_files()])
 
 
 @tutil.skip_sleep

-----------------------------------------------------------------------


hooks/post-receive
--