Merge branch 'master' into 7253-datamanager-test-errors

[arvados.git] / services / fuse / tests / test_command_args.py

diff --git a/services/fuse/tests/test_command_args.py b/services/fuse/tests/test_command_args.py
index 62987cc068ef2de379a5e03457c785e567ff2e2a..19d56a9baf79688b38a3159cd860f85b8b9eb8c6 100644 (file)
--- 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
 
+@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)