Merge lp:~roadmr/checkbox/1183236-exporter-summary-order into lp:checkbox

[Daniel Manrique]

Reorders one field in the xml exporter's "summary" section to avoid triggering the linked bug.

Reorders one field in the xml exporter's "summary" section to avoid triggering the linked bug.

[Daniel Manrique (roadmr)]

Self-approving to see if we can get this in by tomorrow's CI run.

review: Approve

[Daniel Manrique (roadmr)]

The attempt to merge lp:~roadmr/checkbox/1183236-exporter-summary-order into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
Timing for [precise] Bringing VM 'up'
7.77user 3.66system 6:55.02elapsed 2%CPU (0avgtext+0avgdata 21348maxresident)k
0inputs+224outputs (0major+185159minor)pagefaults 0swaps
[precise] Starting tests...
[precise] CheckBox test suite: pass
Timing for Checkbox test suite
0.74user 0.31system 0:10.90elapsed 9%CPU (0avgtext+0avgdata 20860maxresident)k
0inputs+16outputs (0major+49308minor)pagefaults 0swaps
Timing for refreshing plainbox installation
0.76user 0.27system 0:05.56elapsed 18%CPU (0avgtext+0avgdata 20560maxresident)k
0inputs+16outputs (0major+49663minor)pagefaults 0swaps
[precise] PlainBox test suite: pass
Timing for plainbox test suite
0.98user 0.33system 0:11.68elapsed 11%CPU (0avgtext+0avgdata 19832maxresident)k
0inputs+184outputs (0major+48974minor)pagefaults 0swaps
[precise] PlainBox documentation build: pass
Timing for plainbox documentation build
0.77user 0.31system 0:15.02elapsed 7%CPU (0avgtext+0avgdata 20876maxresident)k
0inputs+16outputs (0major+48924minor)pagefaults 0swaps
[precise] CheckBoxNG test suite: pass
Timing for checkbox-ng test suite
0.79user 0.23system 0:06.22elapsed 16%CPU (0avgtext+0avgdata 20328maxresident)k
0inputs+16outputs (0major+49066minor)pagefaults 0swaps
[precise] Integration tests: pass
Timing for integration tests
0.78user 0.31system 0:08.92elapsed 12%CPU (0avgtext+0avgdata 20200maxresident)k
0inputs+8outputs (0major+47123minor)pagefaults 0swaps
[precise] Destroying VM
[quantal] Bringing VM 'up'
Timing for [quantal] Bringing VM 'up'
8.20user 3.50system 5:09.38elapsed 3%CPU (0avgtext+0avgdata 21180maxresident)k
0inputs+216outputs (0major+219590minor)pagefaults 0swaps
[quantal] Starting tests...
[quantal] CheckBox test suite: pass
Timing for Checkbox test suite
0.83user 0.26system 0:13.66elapsed 8%CPU (0avgtext+0avgdata 19856maxresident)k
0inputs+16outputs (0major+47475minor)pagefaults 0swaps
Timing for refreshing plainbox installation
0.87user 0.30system 0:07.12elapsed 16%CPU (0avgtext+0avgdata 20440maxresident)k
0inputs+16outputs (0major+49648minor)pagefaults 0swaps
[quantal] PlainBox test suite: pass
Timing for plainbox test suite
1.02user 0.34system 0:16.20elapsed 8%CPU (0avgtext+0avgdata 19856maxresident)k
0inputs+184outputs (0major+49811minor)pagefaults 0swaps
[quantal] PlainBox documentation build: pass
Timing for plainbox documentation build
0.84user 0.35system 0:08.18elapsed 14%CPU (0avgtext+0avgdata 20752maxresident)k
0inputs+8outputs (0major+49894minor)pagefaults 0swaps
[quantal] CheckBoxNG test suite: pass
Timing for checkbox-ng test suite
0.78user 0.26system 0:08.36elapsed 12%CPU (0avgtext+0avgdata 20552maxresident)k
0inputs+16outputs (0major+49642minor)pagefaults 0swaps
[quantal] Integration tests: pass
Timing for integration tests
0.76user 0.28system 0:12.25elapsed 8%CPU (0avgtext+0avgdata 20760maxresident)k
0inputs+8outputs (0major+49646minor)pagefaults 0swaps
[quantal] Destroying VM
[raring] Bringing VM 'up'
Timing for [raring] Bringing VM 'up'
8.38user 3.66system 3:55.63elapsed 5%CPU (0avgtext+0avgdata 22204maxresident)k
0...

[Daniel Manrique (roadmr)]

tarmac fail, reapproving.

review: Approve

=== modified file 'plainbox/plainbox/impl/exporter/xml.py'
--- plainbox/plainbox/impl/exporter/xml.py	2013-04-26 21:16:07 +0000
+++ plainbox/plainbox/impl/exporter/xml.py	2013-05-23 21:42:26 +0000
@@ -352,6 +352,11 @@
         # Insert the generation timestamp
         ET.SubElement(
             summary, "date_created", attrib={"value": self._timestamp})
+        # Dump some data from 'dpkg' resource
+        if "dpkg" in data["resource_map"]:
+            ET.SubElement(
+                summary, "architecture", attrib={
+                    "value": data["resource_map"]["dpkg"][0]["architecture"]})
         # Dump some data from 'lsb' resource
         if "lsb" in data["resource_map"]:
             ET.SubElement(
@@ -360,11 +365,6 @@
             ET.SubElement(
                 summary, "distroseries", attrib={
                     "value": data["resource_map"]["lsb"][0]["release"]})
-        # Dump some data from 'dpkg' resource
-        if "dpkg" in data["resource_map"]:
-            ET.SubElement(
-                summary, "architecture", attrib={
-                    "value": data["resource_map"]["dpkg"][0]["architecture"]})
         # Dump some data from 'uname' resource
         if "uname" in data["resource_map"]:
             ET.SubElement(

=== modified file 'plainbox/plainbox/test-data/xml-exporter/example-data.xml'
--- plainbox/plainbox/test-data/xml-exporter/example-data.xml	2013-04-09 20:24:11 +0000
+++ plainbox/plainbox/test-data/xml-exporter/example-data.xml	2013-05-23 21:42:26 +0000
@@ -15737,9 +15737,9 @@
   <summary>
     <client name="plainbox" version="1.0"/>
     <date_created value="2012-12-21T12:00:00"/>
+    <architecture value="amd64"/>
     <distribution value="Ubuntu"/>
     <distroseries value="12.04"/>
-    <architecture value="amd64"/>
     <kernel-release value="3.2.0-36-generic"/>
     <private value="False"/>
     <contactable value="False"/>