Merge lp://staging/~bjornt/launchpad/bug-430813 into lp://staging/launchpad

Proposed by Björn Tillenius
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~bjornt/launchpad/bug-430813
Merge into: lp://staging/launchpad
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~bjornt/launchpad/bug-430813
Reviewer Review Type Date Requested Status
Michael Nelson (community) code Approve
Review via email: mp+11967@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Björn Tillenius (bjornt) wrote :

Change 'make jscheck' to run only tests in the WindmillLayers.

A lot of the old funtest tests are failing, so the current 'make
jscheck' is quite useless. The plan is to have 'make jscheck' run only
the new-style tests, which all pass now, and then convert the old tests
while making sure the test actually passes. This has been discussed with
Francis and others.

I provided 'make jscheck_funtest' to run the old tests, in case someone
want to run them. This should get removed when all tests are converted.

This branch depends on lp:~bjornt/launchpad/windmill-test-layer, so if
the diff contains changes to other files than the Makefile, the diff is
probably incorrect.

--
Björn Tillenius | https://launchpad.net/~bjornt

Revision history for this message
Michael Nelson (michael.nelson) wrote :

r=me

Thanks BjornT! I'm looking forward to adding the soyuz windmill tests :)

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2009-09-15 08:58:30 +0000
3+++ Makefile 2009-09-17 12:56:07 +0000
4@@ -92,6 +92,13 @@
5 @echo
6 bin/test $(VERBOSITY) --layer=BugsWindmillLayer
7 bin/test $(VERBOSITY) --layer=CodeWindmillLayer
8+
9+jscheck_functest: build
10+ # Run the old functest Windmill integration tests. The test runner
11+ # takes care of setting up the test environment.
12+ @echo
13+ @echo "Running Windmill funtest integration test suite"
14+ @echo
15 bin/jstest
16
17 check_mailman: build