Merge lp:~gmb/maas-test/report-machine-info into lp:maas-test

[Graham Binns]

Include a dump of lshw info from the commissioned node with the test log.

This branch adds a dump of the MAAS DB as an attachment to the blob generated by maas-test. We can use this to help us get more information about failures. In future we can extract data from this dump and use it in the bug report to help Launchpad de-dupe, but for now this is a good start.

[Raphaël Badin (rvb)]

I might be missing something but why didn't you do something similar to what we did with MAASFixture.collect_logs and leverage the addDetail/fixture cleanup combination… i.e. something along the lines of http://paste.ubuntu.com/6744843/ ? It seems a bit simpler to me.

[Graham Binns (gmb)]

You were quite right, Raphers; I've fixed it to use the fixture/cleanup route now.

[lp:~gmb/maas-test/report-machine-info]

132. By Graham Binns on 2014-01-17

Fixed a hack.

[Gavin Panella (allenap)]

Point [2] needs addressing, but it doesn't need re-review. Nice.

[1]

+    def dump_data(self, dump_dir=None):

Please be adding a docstring.

[2]

+    def dump_data(self, dump_dir=None):
+        if dump_dir is None:
+            dump_dir = utils.DEFAULT_LOG_DIR
+        return_code, stdout, _ = self.kvm_fixture.run_command([
+            'sudo', 'maas', 'dumpdata', 'metadataserver.NodeCommissionResult'
+            ])

dump_dir isn't being used for anything. Can it be dropped?

[3]

MAASFixture looks like it's gone all 2008-financial-crisis: too big to
fail, too big to test. It would be good to have a test that confirms
that the data is dumped during clean-up, but I suspect that the noise of
set-up (mocking, etc.) would smother the useful kernel of the test.

review: Approve

[lp:~gmb/maas-test/report-machine-info]

133. By Graham Binns on 2014-01-17

Removed reference to log dir from MAASFixture.dump_data(), since it's no longer used.

134. By Graham Binns on 2014-01-17

Added a docstring.

[Gavin Panella (allenap)]

[4]

     def dump_data(self, dump_dir=None):
-        if dump_dir is None:
-            dump_dir = utils.DEFAULT_LOG_DIR
+        """Dump the NodeCommissionResult table to stdout.
+
+        This allows us to capture the lshw results for commissioned
+        nodes. This method will be called when the fixture get cleaned
+        up.
+        """

You probably ought to remove the dump_dir argument too, and update the
test.

[Graham Binns (gmb)]

Damn.

[Graham Binns (gmb)]

Done.

[lp:~gmb/maas-test/report-machine-info]

135. By Graham Binns on 2014-01-17

Removed silliness.

[Gavin Panella (allenap)]

Looks good :)

=== modified file 'maastest/maasfixture.py'
--- maastest/maasfixture.py	2014-01-16 14:17:16 +0000
+++ maastest/maasfixture.py	2014-01-17 10:48:57 +0000
@@ -181,6 +181,17 @@
 
         return username, password
 
+    def dump_data(self):
+        """Dump the NodeCommissionResult table to stdout.
+
+        This allows us to capture the lshw results for commissioned
+        nodes. This method will be called when the fixture get cleaned
+        up.
+        """
+        return_code, stdout, _ = self.kvm_fixture.run_command([
+            'sudo', 'maas', 'dumpdata', 'metadataserver.NodeCommissionResult'
+            ])
+
     def import_maas_images(self, series, architecture):
         """Import boot images into the MAAS instance.
 
@@ -254,6 +265,7 @@
             self.configure_cluster()
         # Cleanups registration.
         self.addCleanup(self.collect_logs)
+        self.addCleanup(self.dump_data)
         self.log_connection_details()
 
     def log_connection_details(self):

=== modified file 'maastest/tests/test_maasfixture.py'
--- maastest/tests/test_maasfixture.py	2014-01-16 14:15:40 +0000
+++ maastest/tests/test_maasfixture.py	2014-01-17 10:48:57 +0000
@@ -728,3 +728,15 @@
             ], check_call=True),
             kvm_fixture.run_command.mock_calls[-1])
         self.assertEqual([mock.call(arch)], mock_mipf_arch_list.mock_calls)
+
+    def test_dump_data_calls_dumpdata(self):
+        maas_fixture = self.make_maas_fixture()
+        self.patch(
+            maas_fixture.kvm_fixture, 'run_command',
+            mock.MagicMock(return_value=(0, '', '')))
+        maas_fixture.dump_data()
+        self.assertIn(
+            mock.call([
+                'sudo', 'maas', 'dumpdata',
+                'metadataserver.NodeCommissionResult']),
+            maas_fixture.kvm_fixture.run_command.mock_calls)