Merge lp:~rvb/maas-test/cleanup-control-c into lp:maas-test

[Raphaël Badin]

Call tearDownClass when KeyboardInterrupt is raised.

The VM machine (and other resources) were not cleaned up with a user hit control-c when the tests are running (note that everything is cleaned up all right if control-c is hit during the preparation phase — i.e. when the fixtures are being created).

I looked into using unittest.installHandler / unittest.registerResult(result) which seem to be designed to achieve the same kind of result. I might be wrong but they seem to be better tailored to cope with test-level cleanups and what we have here is class-level cleanups so I think the solution I'm putting out for review here is simpler and fits out particular use-case better; of course, I'm happy to be proven wrong.

[Gavin Panella (allenap)]

This is a band-aid, but then unittest seems to have devolved into a mess; it's hard to do the right thing. This does miss out on test-level and module-level tearDowns, but it's an improvement nonetheless. Perhaps you could add a comment about that to the code?

review: Approve

[Raphaël Badin (rvb)]

> This is a band-aid, but then unittest seems to have devolved into a mess; it's
> hard to do the right thing. This does miss out on test-level and module-level
> tearDowns, but it's an improvement nonetheless. Perhaps you could add a
> comment about that to the code?

Sure thing, done. Thanks for the review and your work to try improving this code. It didn't pan out, but it's appreciated nonetheless.

[MAAS Lander (maas-lander)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'maastest/main.py'
--- maastest/main.py	2013-11-29 13:22:37 +0000
+++ maastest/main.py	2013-12-05 12:08:41 +0000
@@ -53,7 +53,14 @@
     ConfiguredTestMAAS.configure(args)
 
     from maastest.console import run_console
-    run_console(ConfiguredTestMAAS)
+    # This try/except is a band-aid to make sure the fixtures gets cleaned
+    # up when a KeyboardInterrupt exception is raised.
+    # This does miss out on test-level and module-level tearDowns.
+    try:
+        run_console(ConfiguredTestMAAS)
+    except KeyboardInterrupt:
+        ConfiguredTestMAAS.tearDownClass()
+        raise
 
 
 if __name__ == '__main__':