[ARVADOS] updated: 606375516f678222465f2643b8162c6973bb28d2

[git at public.curoverse.com]

Summary of changes:
 sdk/python/tests/test_arv_put.py  | 10 +++++++---
 services/fuse/tests/test_mount.py | 21 ++++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

       via  606375516f678222465f2643b8162c6973bb28d2 (commit)
       via  398a5ef03226f2f3ba06b6ad05a61f3a4b403cf7 (commit)
      from  820ce7ad92cba95587800a275e14bbf24670898f (commit)

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 606375516f678222465f2643b8162c6973bb28d2
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Feb 12 18:23:38 2015 -0500

    5200: Fix overly sensitive fuse test. (Do not fail every time a fixture is added.)

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 386dc34..f9fcd73 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -277,9 +277,24 @@ class FuseHomeTest(MountTestBase):
         self.assertIn('Unrestricted public data', d1)
 
         d2 = os.listdir(os.path.join(self.mounttmp, 'Unrestricted public data'))
-        self.assertEqual(['GNU General Public License, version 3',
-                          'Pipeline in publicly accessible project.pipelineInstance',
-                          'Pipeline template in publicly accessible project.pipelineTemplate'], d2)
+        public_project = run_test_server.fixture('groups')[
+            'anonymously_accessible_project']
+        found_in = 0
+        found_not_in = 0
+        for name, item in run_test_server.fixture('collections').iteritems():
+            if 'name' not in item:
+                pass
+            elif item['owner_uuid'] == public_project['uuid']:
+                self.assertIn(item['name'], d2)
+                found_in += 1
+            else:
+                # Artificial assumption here: there is no public
+                # collection fixture with the same name as a
+                # non-public collection.
+                self.assertNotIn(item['name'], d2)
+                found_not_in += 1
+        self.assertNotEqual(0, found_in)
+        self.assertNotEqual(0, found_not_in)
 
         d3 = os.listdir(os.path.join(self.mounttmp, 'Unrestricted public data', 'GNU General Public License, version 3'))
         self.assertEqual(["GNU_General_Public_License,_version_3.pdf"], d3)

commit 398a5ef03226f2f3ba06b6ad05a61f3a4b403cf7
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Feb 12 17:42:16 2015 -0500

    5200: Do not fail tests if application.yml is missing: defaults are enough to pass tests.

diff --git a/sdk/python/tests/test_arv_put.py b/sdk/python/tests/test_arv_put.py
index 196264f..41fa8cf 100644
--- a/sdk/python/tests/test_arv_put.py
+++ b/sdk/python/tests/test_arv_put.py
@@ -399,9 +399,13 @@ class ArvadosPutTest(run_test_server.TestCaseWithServers, ArvadosBaseTestCase):
 class ArvPutIntegrationTest(run_test_server.TestCaseWithServers,
                             ArvadosBaseTestCase):
     def _getKeepServerConfig():
-        for config_file in ['application.yml', 'application.default.yml']:
-            with open(os.path.join(run_test_server.SERVICES_SRC_DIR,
-                                   "api", "config", config_file)) as f:
+        for config_file, mandatory in [
+                ['application.yml', True], ['application.default.yml', False]]:
+            path = os.path.join(run_test_server.SERVICES_SRC_DIR,
+                                "api", "config", config_file)
+            if not mandatory and not os.path.exists(path):
+                continue
+            with open(path) as f:
                 rails_config = yaml.load(f.read())
                 for config_section in ['test', 'common']:
                     try:

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


hooks/post-receive
--