Merge lp:~pwlars/lava-test/bug639930 into lp:lava-test/0.0

[Paul Larson]

[James Westby (james-w)]

Hi,

Looks ok, though NotImplementedError is a bit generic to catch
and give that message. Where in particular does it get thrown?

Thanks,

James

review: Needs Information

[Paul Larson (pwlars)]

On Wed, 2010-09-15 at 20:54 +0000, James Westby wrote:
> Review: Needs Information
> Hi,
>
> Looks ok, though NotImplementedError is a bit generic to catch
> and give that message. Where in particular does it get thrown?
That was there from before. Mostly I put it there as a trap for if
there was ever a command without run() implemented.

[James Westby (james-w)]

Ah, I see it. Might it be better to have a split between normal commands
and commands with subcommands? That way this could be dealt with better,
without any loss in functionality, as I have trouble seeing a use for
a command that can have optional subcommands.

That split could either be a class split, or just a check for len(self.subcommands),
depending on how deep the changes go.

Thanks,

James

[Paul Larson (pwlars)]

That's a good idea, but unless you have a problem with it, I'd like to go ahead and check this in to fix the bug, then revisit that later.

[James Westby (james-w)]

On Fri, 17 Sep 2010 14:36:15 -0000, Paul Larson <email address hidden> wrote:
> That's a good idea, but unless you have a problem with it, I'd like to go ahead and check this in to fix the bug, then revisit that later.

That sounds ok to me. Please file a bug for that so that we don't
forget.

Thanks,

James

=== modified file 'abrek/main.py'
--- abrek/main.py	2010-08-26 20:05:06 +0000
+++ abrek/main.py	2010-09-15 20:36:12 +0000
@@ -17,15 +17,19 @@
 import abrek.command
 
 
-def main(argv=None):
-    if argv is None:
-        argv = sys.argv[1:]
-        if not argv:
-            argv = ['help']
-        cmd = argv.pop(0)
-        cmd_func = abrek.command.get_command(cmd)
-        if not cmd_func:
-            print "command '%s' not found" % cmd
-            return 1
-        main = cmd_func.main
+def main(argv):
+    origargv = argv
+    argv = argv[1:]
+    if not argv:
+        argv = ['help']
+    cmd = argv.pop(0)
+    cmd_func = abrek.command.get_command(cmd)
+    if not cmd_func:
+        print "command '%s' not found" % cmd
+        return 1
+    main = cmd_func.main
+    try:
         main(argv)
+    except NotImplementedError:
+        print >>sys.stderr, "Unknown usage '%s'" % " ".join(origargv)
+        print >>sys.stderr, "Use 'abrek help [cmd]' for help"

=== modified file 'bin/abrek'
--- bin/abrek	2010-08-18 15:33:32 +0000
+++ bin/abrek	2010-09-15 20:36:12 +0000
@@ -27,5 +27,5 @@
 import abrek.main
 
 if __name__ == '__main__':
-    exit_code = abrek.main.main()
+    exit_code = abrek.main.main(sys.argv)
     sys.exit(exit_code)

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2010-09-10 17:09:14 +0000
+++ tests/__init__.py	2010-09-15 20:36:12 +0000
@@ -23,6 +23,7 @@
                     'tests.test_builtins',
                     'tests.test_dashboard',
                     'tests.test_hwprofile',
+                    'tests.test_main',
                     'tests.test_results',
                     'tests.test_swprofile']
     loader = unittest.TestLoader()

=== modified file 'tests/imposters.py'
--- tests/imposters.py	2010-09-10 17:09:14 +0000
+++ tests/imposters.py	2010-09-15 20:36:12 +0000
@@ -25,10 +25,12 @@
 class OutputImposter(object):
     def setUp(self):
         self.origstdout = sys.stdout
-        sys.stdout = self.fakestdout = StringIO.StringIO()
+        self.origstderr = sys.stderr
+        sys.stdout = sys.stderr = self.fakestdout = StringIO.StringIO()
 
     def tearDown(self):
         sys.stdout = self.origstdout
+        sys.stderr = self.origstderr
 
     def getvalue(self):
         return self.fakestdout.getvalue()

=== added file 'tests/test_main.py'
--- tests/test_main.py	1970-01-01 00:00:00 +0000
+++ tests/test_main.py	2010-09-15 20:36:12 +0000
@@ -0,0 +1,31 @@
+# Copyright (c) 2010 Linaro
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from abrek.main import main
+from imposters import OutputImposter
+from fixtures import TestCaseWithFixtures
+
+
+class testMain(TestCaseWithFixtures):
+    def setUp(self):
+        super(testMain, self).setUp()
+        self.out = self.add_fixture(OutputImposter())
+        self._fixtures = []
+
+    def test_bad_subcmd(self):
+        errmsg = "Unknown usage './abrek results foo'\nUse 'abrek help [cmd]' for help\n"
+        main(['./abrek', 'results', 'foo'])
+        self.assertEqual(errmsg, self.out.getvalue())
+