7939: Use 100:: for bogus host check and add comment about API check.

[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 8f040bc180e91a8e7738b6121cddc74dd891b170..bfefc674d7991dd80963a5d102a1bc757bc7bfb3 100644 (file)
--- a/services/fuse/tests/test_command_args.py
+++ b/services/fuse/tests/test_command_args.py
@@ -205,21 +205,31 @@ class MountErrorTest(unittest.TestCase):
     def test_no_token(self):
         del arvados.config._settings["ARVADOS_API_TOKEN"]
         arvados.config._settings = {}
-        with self.assertRaises(SystemExit):
+        with self.assertRaises(SystemExit) as ex:
             args = arvados_fuse.command.ArgumentParser().parse_args([self.mntdir])
             arvados_fuse.command.Mount(args, logger=self.logger).run()
+        self.assertEqual(1, ex.exception.code)
 
     def test_no_host(self):
         del arvados.config._settings["ARVADOS_API_HOST"]
-        with self.assertRaises(SystemExit):
+        with self.assertRaises(SystemExit) as ex:
             args = arvados_fuse.command.ArgumentParser().parse_args([self.mntdir])
             arvados_fuse.command.Mount(args, logger=self.logger).run()
+        self.assertEqual(1, ex.exception.code)
 
     def test_bogus_host(self):
-        arvados.config._settings["ARVADOS_API_HOST"] = "example.null"
-        with self.assertRaises(SystemExit):
+        arvados.config._settings["ARVADOS_API_HOST"] = "100::"
+        with self.assertRaises(SystemExit) as ex:
             args = arvados_fuse.command.ArgumentParser().parse_args([self.mntdir])
             arvados_fuse.command.Mount(args, logger=self.logger).run()
+        self.assertEqual(1, ex.exception.code)
+
+    def test_bogus_token(self):
+        arvados.config._settings["ARVADOS_API_TOKEN"] = "zzzzzzzzzzzzz"
+        with self.assertRaises(SystemExit) as ex:
+            args = arvados_fuse.command.ArgumentParser().parse_args([self.mntdir])
+            arvados_fuse.command.Mount(args, logger=self.logger).run()
+        self.assertEqual(1, ex.exception.code)
 
     def test_bogus_mount_dir(self):
         # All FUSE errors in llfuse.init() are raised as RuntimeError
@@ -234,18 +244,21 @@ class MountErrorTest(unittest.TestCase):
         # The user specified --allow-other but user_allow_other is not set
         # in /etc/fuse.conf
         os.rmdir(self.mntdir)
-        with self.assertRaises(SystemExit):
+        with self.assertRaises(SystemExit) as ex:
             args = arvados_fuse.command.ArgumentParser().parse_args([self.mntdir])
             arvados_fuse.command.Mount(args, logger=self.logger).run()
+        self.assertEqual(1, ex.exception.code)
 
     def test_unreadable_collection(self):
-        with self.assertRaises(SystemExit):
+        with self.assertRaises(SystemExit) as ex:
             args = arvados_fuse.command.ArgumentParser().parse_args([
                 "--collection", "zzzzz-4zz18-zzzzzzzzzzzzzzz", self.mntdir])
             arvados_fuse.command.Mount(args, logger=self.logger).run()
+        self.assertEqual(1, ex.exception.code)
 
     def test_unreadable_project(self):
-        with self.assertRaises(SystemExit):
+        with self.assertRaises(SystemExit) as ex:
             args = arvados_fuse.command.ArgumentParser().parse_args([
                 "--project", "zzzzz-j7d0g-zzzzzzzzzzzzzzz", self.mntdir])
             arvados_fuse.command.Mount(args, logger=self.logger).run()
+        self.assertEqual(1, ex.exception.code)