Fix test failure caused by making genconfig trackerless

When I removed the need to have a tracker for genconfig, I broke a
couple of tests. The breakage was hidden by a bad workflow.

This change allows the tests to pass and refactors reporting of
UsageError exceptions in admin.py.

It also adds a test for failure in install command as there is a test
case for it and this test tests the refactor.

Author: rouilj

roundup/admin.py

@@ -1920,6 +1920,12 @@ def do_updateconfig(self, args):
         """
         self.do_genconfig(args, update=True)
 
+    def usageError_feedback(self, message, function):
+        print(_('Error: %s') % message)
+        print()
+        print(function.__doc__)
+        return 1
+
     def run_command(self, args):
         """Run a single command
         """
@@ -1937,12 +1943,6 @@ def run_command(self, args):
             self.help_commands()
             self.help_all()
             return 0
-        if command == 'templates':
-            return self.do_templates(args[1:])
-            return 0
-        if command == 'genconfig':
-            return self.do_genconfig(args[1:])
-            return 0
 
         # figure what the command is
         try:
@@ -1961,6 +1961,13 @@ def run_command(self, args):
             return 1
         command, function = functions[0]
 
+        if command in ['genconfig', 'templates']:
+            try:
+                ret = function(args[1:])
+                return ret
+            except UsageError as message:  # noqa F841
+              return self.usageError_feedback(message, function)
+
         # make sure we have a tracker_home
         while not self.tracker_home:
             if not self.force:
@@ -1973,14 +1980,12 @@ def run_command(self, args):
             try:
                 return self.do_initialise(self.tracker_home, args)
             except UsageError as message:  # noqa: F841
-                print(_('Error: %(message)s') % locals())
-                return 1
+              return self.usageError_feedback(message, function)
         elif command == 'install':
             try:
                 return self.do_install(self.tracker_home, args)
             except UsageError as message:  # noqa: F841
-                print(_('Error: %(message)s') % locals())
-                return 1
+              return self.usageError_feedback(message, function)
 
         # get the tracker
         try:
@@ -2020,10 +2025,7 @@ def run_command(self, args):
         try:
             ret = function(args[1:])
         except UsageError as message:  # noqa: F841
-            print(_('Error: %(message)s') % locals())
-            print()
-            print(function.__doc__)
-            ret = 1
+            ret = self.usageError_feedback(message, function)
         except Exception:
             import traceback
             traceback.print_exc()

test/test_admin.py

@@ -255,6 +255,18 @@ def testInit(self):
         self.assertTrue(os.path.isfile(self.dirname + "/config.ini"))
         self.assertTrue(os.path.isfile(self.dirname + "/schema.py"))
 
+        self.admin=AdminTool()
+        with captured_output() as (out, err):
+            sys.argv=['main', '-i', '/tmp/noSuchDirectory/nodir', 'install', 'classic', self.backend]
+            ret = self.admin.main()
+
+        out = out.getvalue().strip()
+        print(ret)
+        print(out)
+        self.assertEqual(ret, 1)
+        self.assertIn('Error: Instance home parent directory '
+                      '"/tmp/noSuchDirectory" does not exist', out)
+
     def testInitWithConfig_ini(self):
         from roundup.configuration import CoreConfig
         self.admin=AdminTool()