[ARVADOS] updated: 273221309b13c6ab1c299095a811041b95ce4fa9

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/events.py             | 12 ++++++------
 services/fuse/tests/test_command_args.py | 31 ++++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 15 deletions(-)

       via  273221309b13c6ab1c299095a811041b95ce4fa9 (commit)
       via  88e999b81f5db7cf0b0e6c81a55cc3b641d536fc (commit)
      from  af17ab93eac126058eac64ef69cd7ed5980ca9f0 (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 273221309b13c6ab1c299095a811041b95ce4fa9
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Nov 22 05:26:13 2015 -0500

    7751: Suppress help messages when testing usage errors.

diff --git a/services/fuse/tests/test_command_args.py b/services/fuse/tests/test_command_args.py
index 62987cc..19d56a9 100644
--- a/services/fuse/tests/test_command_args.py
+++ b/services/fuse/tests/test_command_args.py
@@ -1,12 +1,14 @@
 import arvados
 import arvados_fuse
 import arvados_fuse.command
+import contextlib
 import functools
 import json
 import llfuse
 import logging
 import os
 import run_test_server
+import sys
 import tempfile
 import unittest
 
@@ -22,6 +24,15 @@ def noexit(func):
             raise SystemExitCaught
     return wrapper
 
+ at contextlib.contextmanager
+def nostderr():
+    orig, sys.stderr = sys.stderr, open(os.devnull, 'w')
+    try:
+        yield
+    finally:
+        sys.stderr = orig
+
+
 class MountArgsTest(unittest.TestCase):
     def setUp(self):
         self.mntdir = tempfile.mkdtemp()
@@ -126,10 +137,11 @@ class MountArgsTest(unittest.TestCase):
                 ['--by-id', '--project', gid],
                 ['--mount-tmp', 'foo', '--by-id'],
         ]:
-            with self.assertRaises(SystemExit):
-                args = arvados_fuse.command.ArgumentParser().parse_args(
-                    badargs + ['--foreground', self.mntdir])
-                arvados_fuse.command.Mount(args)
+            with nostderr():
+                with self.assertRaises(SystemExit):
+                    args = arvados_fuse.command.ArgumentParser().parse_args(
+                        badargs + ['--foreground', self.mntdir])
+                    arvados_fuse.command.Mount(args)
     @noexit
     def test_project(self):
         uuid = run_test_server.fixture('groups')['aproject']['uuid']
@@ -169,8 +181,9 @@ class MountArgsTest(unittest.TestCase):
 
     def test_custom_unsupported_layouts(self):
         for name in ['.', '..', '', 'foo/bar', '/foo']:
-            with self.assertRaises(SystemExit):
-                args = arvados_fuse.command.ArgumentParser().parse_args([
-                    '--mount-tmp', name,
-                    '--foreground', self.mntdir])
-                arvados_fuse.command.Mount(args)
+            with nostderr():
+                with self.assertRaises(SystemExit):
+                    args = arvados_fuse.command.ArgumentParser().parse_args([
+                        '--mount-tmp', name,
+                        '--foreground', self.mntdir])
+                    arvados_fuse.command.Mount(args)

commit 88e999b81f5db7cf0b0e6c81a55cc3b641d536fc
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Nov 22 05:03:36 2015 -0500

    7751: 7654: Rename bool to _closed to avoid conflicting with superclass closed() method.

diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index 07c6a47..3132da3 100644
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -29,23 +29,23 @@ class EventClient(WebSocketClient):
         self.filters = filters
         self.on_event = on_event
         self.last_log_id = last_log_id
-        self.closed_lock = threading.RLock()
-        self.closed = False
+        self._closed_lock = threading.RLock()
+        self._closed = False
 
     def opened(self):
         self.subscribe(self.filters, self.last_log_id)
 
     def received_message(self, m):
-        with self.closed_lock:
-            if not self.closed:
+        with self._closed_lock:
+            if not self._closed:
                 self.on_event(json.loads(str(m)))
 
     def close(self, code=1000, reason=''):
         """Close event client and wait for it to finish."""
         super(EventClient, self).close(code, reason)
-        with self.closed_lock:
+        with self._closed_lock:
             # make sure we don't process any more messages.
-            self.closed = True
+            self._closed = True
 
     def subscribe(self, filters, last_log_id=None):
         m = {"method": "subscribe", "filters": filters}

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


hooks/post-receive
--