Merge lp:~statik/tarmac/makefile into lp:tarmac

[Elliot Murphy]

[Elliot Murphy (statik)]

This branch adds a makefile with two targets:
 make test

and

 make test-fail

useful for testing ;)

also fixes up the help for the --test-command option to show what the default test command is.

[Paul Hummer (rockstar)]

Thanks for the branch!

 vote approve
 status approve

> === added file 'Makefile'
> --- Makefile 1970-01-01 00:00:00 +0000
> +++ Makefile 2009-03-05 02:22:12 +0000
> @@ -0,0 +1,8 @@
> +TESTFLAGS=
> +test:
> + trial $(TESTFLAGS) tarmac
> +
> +test-fail:
> + trial this-will-fail
> +
> +.PHONY: test test-fail
>

This is a clever way of dealing with the difficulty with testing. I like it.

--
Paul Hummer
http://theironlion.net
1024/862FF08F C921 E962 58F8 5547 6723 0E8C 1C4D 8AC5 862F F08F

review: Approve

[Paul Hummer (rockstar)]

Commit message: Makefile added for easily testing the --test-command (Elliot Murphy)

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2009-03-05 02:22:12 +0000
@@ -0,0 +1,8 @@
+TESTFLAGS=
+test:
+	trial $(TESTFLAGS) tarmac
+
+test-fail:
+	trial this-will-fail
+
+.PHONY: test test-fail
 
=== modified file 'tarmac/bin.py'
--- tarmac/bin.py	2009-03-05 01:21:01 +0000
+++ tarmac/bin.py	2009-03-05 03:00:22 +0000
@@ -27,7 +27,9 @@
             help='Print out the branches that would be merged and their '
                  'commit messages, but don\'t actually merge the branches.')
         parser.add_option('--test-command', type='string', default='make test',
-            help='The test command to run after merging a branch.')
+            metavar='TEST',
+            help='The test command to run after merging a branch [default: '
+                  '%default].')
         options, args = parser.parse_args()
         self.dry_run = options.dry_run
         self.test_command = options.test_command
@@ -103,6 +105,8 @@
             if retcode == 0:
                 # TODO: It would be very nice if the commit message included
                 # some reference to the people who voted approve.
+                print '%s succeeded, committing.' % self.test_command
                 target_tree.commit(commit_message)
             else:
+                print '%s failed, reverting.' % self.test_command
                 target_tree.revert()