Merge lp:~coreygoldberg/autopilot/fix-tests-1281733 into lp:autopilot

[Corey Goldberg]

Fix test_command_line_args issues with python 3.4.

@expectedFailure decorator is breaking in python3.4,

this branch removes it's use in test_command_line_args.py and refactors the tests to do an assertRaises.

all unit tests now pass in python3.4.

[Thomi Richards (thomir-deactivatedaccount)]

A few comments:

1) you don't need to import ExpectedException any more.

2) Please rename your exception to 'InvalidArguments' - there's no need to have both ''Invalid' and 'Error' in the exception name.

3) When raising The InvalidArguments Error, just do:

raise InvalidArguments("%s" % e)

(note the '%s' instead of '%r').

Otherwise, LGTM - make sure you run flake8 over it as well.

review: Needs Fixing

[lp:~coreygoldberg/autopilot/fix-tests-1281733]

439. By Corey Goldberg on 2014-02-19

unused imports removed

440. By Corey Goldberg on 2014-02-19

fixed flake8 and review comments

[Corey Goldberg (coreygoldberg)]

fixed per thomi's comments

[Thomi Richards (thomir-deactivatedaccount)]

Looks fantastic to me!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/autopilot-ci/498/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/224/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/224/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3310/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3312/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/498/rebuild

review: Needs Fixing (continuous-integration)

[lp:~coreygoldberg/autopilot/fix-tests-1281733]

441. By Corey Goldberg on 2014-02-19

fixed merge conflict

=== modified file 'autopilot/__init__.py'
--- autopilot/__init__.py	2014-01-14 20:09:40 +0000
+++ autopilot/__init__.py	2014-02-19 17:55:18 +0000
@@ -143,6 +143,10 @@
     # http://bugs.python.org/issue16308
     if args.mode is None:
         parser.error("too few arguments")
+
+    if 'suite' in args:
+        args.suite = [suite.rstrip('/') for suite in args.suite]
+
     return args
 
 
 
=== modified file 'autopilot/tests/unit/test_command_line_args.py'
--- autopilot/tests/unit/test_command_line_args.py	2014-01-14 20:09:40 +0000
+++ autopilot/tests/unit/test_command_line_args.py	2014-02-19 17:55:18 +0000
@@ -33,11 +33,14 @@
 
 from testtools import TestCase
 from testtools.matchers import Equals
-from unittest import expectedFailure
 
 from autopilot import parse_arguments
 
 
+class InvalidArguments(Exception):
+    pass
+
+
 class CommandLineArgsTests(TestCase):
 
     def parse_args(self, args):
@@ -46,7 +49,7 @@
         try:
             return parse_arguments(args)
         except SystemExit as e:
-            self.fail("Caught exception: %r" % e)
+            raise InvalidArguments("%s" % e)
 
     def test_launch_command_accepts_application(self):
         args = self.parse_args("launch app")
@@ -65,9 +68,9 @@
         self.assertThat(args.interface, Equals("Gtk"))
 
     @patch('sys.stderr', new=StringIO())
-    @expectedFailure
     def test_launch_command_fails_on_unknown_interface(self):
-        self.parse_args("launch -i unknown app")
+        self.assertRaises(
+            InvalidArguments, self.parse_args, "launch -i unknown app")
 
     def test_launch_command_has_correct_default_verbosity(self):
         args = self.parse_args("launch app")
@@ -98,9 +101,8 @@
             Equals(["app", "-s", "--long", "--key=val", "arg1", "arg2"]))
 
     @patch('sys.stderr', new=StringIO())
-    @expectedFailure
     def test_launch_command_must_specify_app(self):
-        self.parse_args("launch")
+        self.assertRaises(InvalidArguments, self.parse_args, "launch")
 
     @patch('autopilot.have_vis', new=lambda: True)
     def test_vis_present_when_vis_module_installed(self):
@@ -109,9 +111,8 @@
 
     @patch('autopilot.have_vis', new=lambda: False)
     @patch('sys.stderr', new=StringIO())
-    @expectedFailure
     def test_vis_not_present_when_vis_module_not_installed(self):
-        self.parse_args('vis')
+        self.assertRaises(InvalidArguments, self.parse_args, 'vis')
 
     @patch('autopilot.have_vis', new=lambda: True)
     def test_vis_default_verbosity(self):
@@ -219,14 +220,14 @@
         self.assertThat(args.failfast, Equals(True))
 
     @patch('sys.stderr', new=StringIO())
-    @expectedFailure
     def test_run_command_unknown_format_short_version(self):
-        self.parse_args('run -f unknown foo')
+        self.assertRaises(
+            InvalidArguments, self.parse_args, 'run -f unknown foo')
 
     @patch('sys.stderr', new=StringIO())
-    @expectedFailure
     def test_run_command_unknown_format_long_version(self):
-        self.parse_args('run --format unknown foo')
+        self.assertRaises(
+            InvalidArguments, self.parse_args, 'run --format unknown foo')
 
     def test_run_command_record_flag_default(self):
         args = self.parse_args("run foo")
@@ -306,9 +307,12 @@
         self.assertThat(args.debug_profile, Equals('verbose'))
 
     @patch('sys.stderr', new=StringIO())
-    @expectedFailure
     def test_cannot_select_other_debug_profile(self):
-        self.parse_args('run --debug-profile nonexistant foo')
+        self.assertRaises(
+            InvalidArguments,
+            self.parse_args,
+            'run --debug-profile nonexistant foo'
+        )
 
     def test_default_timeout_profile_is_normal(self):
         args = self.parse_args('run foo')
@@ -319,6 +323,25 @@
         self.assertThat(args.timeout_profile, Equals('long'))
 
     @patch('sys.stderr', new=StringIO())
-    @expectedFailure
     def test_cannot_select_other_timeout_profile(self):
-        self.parse_args('run --timeout-profile nonexistant foo')
+        self.assertRaises(
+            InvalidArguments,
+            self.parse_args,
+            'run --timeout-profile nonexistant foo'
+        )
+
+    def test_list_mode_strips_single_suite_slash(self):
+        args = self.parse_args('list foo/')
+        self.assertThat(args.suite, Equals(["foo"]))
+
+    def test_list_mode_strips_multiple_suite_slash(self):
+        args = self.parse_args('list foo/ bar/')
+        self.assertThat(args.suite, Equals(["foo", "bar"]))
+
+    def test_run_mode_strips_single_suite_slash(self):
+        args = self.parse_args('run foo/')
+        self.assertThat(args.suite, Equals(["foo"]))
+
+    def test_run_mode_strips_multiple_suite_slash(self):
+        args = self.parse_args('run foo/ bar/')
+        self.assertThat(args.suite, Equals(["foo", "bar"]))