Merge lp:~jtv/maas-test/maasfixture-log-earlier into lp:maas-test

[Jeroen T. Vermeulen]

Request gathering of MAAS-side logs from an earlier stage in MAASFixture setup. The CI lab is hitting errors while making its first API request during MAASFixture setup, and this should add useful debugging information to that failure.

[Raphaël Badin (rvb)]

review: Approve

[Gavin Panella (allenap)]

review: Approve

=== modified file 'maastest/maasfixture.py'
--- maastest/maasfixture.py	2014-04-03 02:10:29 +0000
+++ maastest/maasfixture.py	2014-04-08 10:58:53 +0000
@@ -281,6 +281,15 @@
         # MAAS setup.
         if self.proxy_url:  # None or '' indicates no proxy.
             self.configure_http_proxy(self.proxy_url)
+
+        # We should have a working MAAS at this point, so if things break from
+        # here on, try to provide relevant information for debugging.
+        self.log_connection_details()
+        self.addCleanup(self.collect_logs)
+        self.addCleanup(self.dump_data)
+
+        # Now do the rest of the setup: import images, configure the
+        # controllers, and so on.
         self.import_maas_images(
             series=self.series, architecture=self.architecture,
             simplestreams_filter=self.simplestreams_filter)
@@ -288,10 +297,6 @@
         if self.kvm_fixture.direct_ip is not None:
             self.check_cluster_connected()
             self.configure_cluster()
-        # Cleanups registration.
-        self.addCleanup(self.collect_logs)
-        self.addCleanup(self.dump_data)
-        self.log_connection_details()
 
     def log_connection_details(self):
         """Log the details on how to connect to this MAAS server."""