tests: Add explicit tests for our main() error wrappers

crobinso · crobinso · commit 21425847e11b · 2018-03-07T16:16:06.000-05:00
diff --git a/bugzilla/_cli.py b/bugzilla/_cli.py
@@ -1134,27 +1134,22 @@ def _main(unittest_bz_instance):
 
 def main(unittest_bz_instance=None):
     try:
-        return _main(unittest_bz_instance)
-    except KeyboardInterrupt:
-        log.debug("", exc_info=True)
-        print("\nExited at user request.")
-        sys.exit(1)
+        try:
+            return _main(unittest_bz_instance)
+        except (Exception, KeyboardInterrupt):
+            log.debug("", exc_info=True)
+            raise
     except (Fault, bugzilla.BugzillaError) as e:
-        log.debug("", exc_info=True)
         print("\nServer error: %s" % str(e))
         sys.exit(3)
     except ProtocolError as e:
-        log.debug("", exc_info=True)
         print("\nInvalid server response: %d %s" % (e.errcode, e.errmsg))
-        # Detect redirect
         redir = (e.headers and 'location' in e.headers)
         if redir:
             print("\nServer was attempting a redirect. Try: "
                   "  bugzilla --bugzilla %s ..." % redir)
         sys.exit(4)
     except requests.exceptions.SSLError as e:
-        log.debug("", exc_info=True)
-
         # Give SSL recommendations
         print("SSL error: %s" % e)
         print("\nIf you trust the remote server, you can work "
@@ -1164,6 +1159,13 @@ def main(unittest_bz_instance=None):
     except (socket.error,
             requests.exceptions.HTTPError,
             requests.exceptions.ConnectionError) as e:
-        log.debug("", exc_info=True)
         print("\nConnection lost/failed: %s" % str(e))
         sys.exit(2)
+
+def cli():
+    try:
+        main()
+    except KeyboardInterrupt:
+        log.debug("", exc_info=True)
+        print("\nExited at user request.")
+        sys.exit(1)
diff --git a/setup.py b/setup.py
@@ -228,7 +228,7 @@ def _parse_requirements(fname):
           'Programming Language :: Python :: 3.6',
       ],
       packages = ['bugzilla'],
-      entry_points={'console_scripts': ['bugzilla = bugzilla._cli:main']},
+      entry_points={'console_scripts': ['bugzilla = bugzilla._cli:cli']},
       data_files=[('share/man/man1', ['bugzilla.1'])],
 
       install_requires=_parse_requirements("requirements.txt"),
diff --git a/tests/ro_functional.py b/tests/ro_functional.py
@@ -352,3 +352,21 @@ def testActiveComps(self):
         out = self.clicomm("info --component_owners 'Virtualization Tools' "
                 "--active-components")
         self.assertTrue("virtinst" not in out)
+
+    def testFaults(self):
+        # Test special error wrappers in bugzilla/_cli.py
+        bzinstance = Bugzilla(self.url, use_creds=False)
+        out = tests.clicomm("bugzilla query --field=IDONTEXIST=FOO",
+            bzinstance, expectfail=True)
+        self.assertTrue("Server error:" in out)
+
+        out = tests.clicomm("bugzilla "
+            "--bugzilla https://example.com/xmlrpc.cgi "
+            "query --field=IDONTEXIST=FOO", None, expectfail=True)
+        self.assertTrue("Connection lost/failed" in out)
+
+        out = tests.clicomm("bugzilla "
+            "--bugzilla https://expired.badssl.com/ "
+            "query --bug_id 1234", None, expectfail=True)
+        self.assertTrue(("trust the remote server" in out) and
+                ("--nosslverify" in out))
