bin: Move class and login handling out of main()

crobinso · crobinso · commit 7d93ba93e54a · 2015-11-19T16:21:58.000-05:00
This is a no-op
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -1153,42 +1153,13 @@ def _do_set_attach(bz, opt, parser, args):
 
 
 #################
-# Main function #
+# Main handling #
 #################
 
-def main(bzinstance=None):
-    parser = setup_parser()
-    (global_opt, args) = parser.parse_args()
-
-    if global_opt.generate_man:
-        generate_man_page()
-        return 0
-
-    if global_opt.debug:
-        log.setLevel(DEBUG)
-    elif global_opt.verbose:
-        log.setLevel(INFO)
-    else:
-        log.setLevel(WARN)
-
-    log.debug("Launched with command line: %s", " ".join(sys.argv))
-
-    # Get our action
-    if len(args) == 0:
-        parser.error("No command specified, command must be one of: %s" %
-                     ', '.join(cmdlist))
-    action = args.pop(0)
-    if action not in cmdlist:
-        parser.error("Unknown command '%s', command must be one of: %s" %
-                     (action, ', '.join(cmdlist)))
-
-    # Parse action-specific args
-    action_parser = setup_action_parser(action)
-    (opt, args) = action_parser.parse_args(args)
-
-    # Connect to bugzilla
-    log.info('Connecting to %s', global_opt.bugzilla)
-
+def _make_bz_instance(global_opt, parser):
+    """
+    Build the Bugzilla instance we will use
+    """
     if global_opt.bztype == 'auto':
         log.info('Autodetecting Bugzilla type')
         bzclass = bugzilla.Bugzilla
@@ -1198,22 +1169,24 @@ def main(bzinstance=None):
     else:
         parser.error("bztype must be one of: %s" % str(bugzilla.classlist))
 
-    if bzinstance:
-        bz = bzinstance
+    if global_opt.cache_credentials:
+        cookiefile = global_opt.cookiefile or -1
+        tokenfile = global_opt.tokenfile or -1
     else:
-        if global_opt.cache_credentials:
-            cookiefile = global_opt.cookiefile or -1
-            tokenfile = global_opt.tokenfile or -1
-        else:
-            cookiefile = None
-            tokenfile = None
-        bz = bzclass(url=global_opt.bugzilla,
-                     cookiefile=cookiefile,
-                     tokenfile=tokenfile,
-                     sslverify=global_opt.sslverify)
+        cookiefile = None
+        tokenfile = None
 
+    bz = bzclass(url=global_opt.bugzilla,
+                 cookiefile=cookiefile,
+                 tokenfile=tokenfile,
+                 sslverify=global_opt.sslverify)
+    return bz
 
-    # Handle 'login' action
+
+def _handle_login(global_opt, parser, args, action, bz):
+    """
+    Handle all login related bits
+    """
     is_login_command = (action == 'login')
     force_login = is_login_command or global_opt.login
 
@@ -1243,6 +1216,48 @@ def main(bzinstance=None):
         sys.exit(1)
 
 
+def main(unittest_bz_instance=None):
+    parser = setup_parser()
+    (global_opt, args) = parser.parse_args()
+
+    if global_opt.generate_man:
+        generate_man_page()
+        return 0
+
+    if global_opt.debug:
+        log.setLevel(DEBUG)
+    elif global_opt.verbose:
+        log.setLevel(INFO)
+    else:
+        log.setLevel(WARN)
+
+    log.debug("Launched with command line: %s", " ".join(sys.argv))
+
+    # Get our action
+    if len(args) == 0:
+        parser.error("No command specified, command must be one of: %s" %
+                     ', '.join(cmdlist))
+    action = args.pop(0)
+    if action not in cmdlist:
+        parser.error("Unknown command '%s', command must be one of: %s" %
+                     (action, ', '.join(cmdlist)))
+
+    # Parse action-specific args
+    action_parser = setup_action_parser(action)
+    (opt, args) = action_parser.parse_args(args)
+
+    # Connect to bugzilla
+    log.info('Connecting to %s', global_opt.bugzilla)
+
+    if unittest_bz_instance:
+        bz = unittest_bz_instance
+    else:
+        bz = _make_bz_instance(global_opt)
+
+    # Handle login options
+    _handle_login(global_opt, parser, args, action, bz)
+
+
     ###########################
     # Run the actual commands #
     ###########################
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -83,7 +83,7 @@ def clicomm(argv, bzinstance, returnmain=False, printcliout=False,
             print(" ".join(argv))
             print()
 
-            mainout = bugzillascript.main(bzinstance)
+            mainout = bugzillascript.main(unittest_bz_instance=bzinstance)
         except SystemExit:
             sys_e = sys.exc_info()[1]
             ret = sys_e.code
