Merge lp:~pwlars/checkbox/remove-date-snap_packages into lp:checkbox

[Paul Larson]

Remove the date field in snap_packages from checkbox_support

Snappy series 16 no longer returns date in 'snap list', so we should not require it

[Maciej Kisielewski (kissiel)]

Look okay, I guess :-)

review: Approve

[Sheila Miguez (codersquid)]

I asked about the removal of the date field vs. defaulting missing ones to ''; but plars explained it is gone. Plus, things are in flux and it is easy to add new or old fields again later.

review: Approve

[Paul Larson (pwlars)]

Resubmitted so that it should work with/without the date field, and added a test so that it's checked both ways.

review: Needs Resubmitting

[Maciej Kisielewski (kissiel)]

If defaulting on missing fields (other than the date) is desired, I'm +1 on that.

[Paul Larson (pwlars)]

I think so, we should discuss. I'd personally think it's better to have the submission work, and see that maybe you are missing some important data, rather than go looking for the submission later and have it just tell you that it's still importing and have no idea if it's actually failing to import or why.

[Paul Larson (pwlars)]

Based on the reviews and discussion so far, I'm going to go ahead and land this. I believe the corresponding changes are also in the process of landing on the certification server side.

[Sylvain Pineau (sylvain-pineau)]

The attempt to merge lp:~pwlars/checkbox/remove-date-snap_packages into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.09user 0.08system 0:04.35elapsed 4%CPU (0avgtext+0avgdata 10248maxresident)k
[precise] (timing) 0inputs+32outputs (0major+8256minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 47.37user 19.38system 1:17.48elapsed 86%CPU (0avgtext+0avgdata 96272maxresident)k
[precise] (timing) 0inputs+19064outputs (0major+3211100minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.72user 0.14system 0:00.88elapsed 98%CPU (0avgtext+0avgdata 48332maxresident)k
[precise-testing] (timing) 0inputs+1384outputs (0major+22237minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: FAIL
[precise-testing] stdout: http://paste.ubuntu.com/16685127/
[precise-testing] stderr: http://paste.ubuntu.com/16685128/
[precise-testing] (timing) Command exited with non-zero status 1
[precise-testing] (timing) 31.75user 0.26system 0:32.08elapsed 99%CPU (0avgtext+0avgdata 151168maxresident)k
[precise-testing] (timing) 0inputs+1368outputs (0major+39340minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.01user 0.01system 0:00.03elapsed 76%CPU (0avgtext+0avgdata 2184maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2375minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 1.07user 0.10system 0:01.19elapsed 98%CPU (0avgtext+0avgdata 46056maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14191minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.30user 0.08system 0:00.40elapsed 97%CPU (0avgtext+0avgdata 20244maxresident)k
[precise-testing] (timing) 0inputs+88outputs (0major+11869minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 53.70user 1.61system 0:55.50elapsed 99%CPU (0avgtext+0avgdata 198536maxresident)k
[precise-testing] (timing) 0inputs+3264outputs (0major+196522minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: PASS
[precise-testing] (timing) 154.10user 0.73system 2:35.07elapsed 99%CPU (0avgtext+0avgdata 186928maxresident)k
[precise-testing] (timing) 0inputs+43184outputs (0major+57218minor)page...

[lp:~pwlars/checkbox/remove-date-snap_packages]

4372. By Paul Larson on 2016-05-27

Remove the date field in snap_packages from checkbox_support

Snappy series 16 no longer returns date in 'snap list', so we should not require it

[Paul Larson (pwlars)]

Oops, forgot one datafile for the new unit test

review: Needs Resubmitting

[Sylvain Pineau (sylvain-pineau)]

Thanks for the fix Paul, +1

review: Approve

=== modified file 'checkbox-support/checkbox_support/parsers/submission.py'
--- checkbox-support/checkbox_support/parsers/submission.py	2016-02-10 09:29:24 +0000
+++ checkbox-support/checkbox_support/parsers/submission.py	2016-05-27 12:25:37 +0000
@@ -857,10 +857,10 @@
 
     def addSnapPackage(self, snap_package):
         snap_package_version = {
-            "name": snap_package["name"],
-            "date": snap_package["properties"]["date"],
-            "version": snap_package["properties"]["version"],
-            "developer": snap_package["properties"]["developer"],
+            "name": snap_package.get("name"),
+            "version": snap_package.get("properties", {}).get("version"),
+            "date": snap_package.get("properties", {}).get("date"),
+            "developer": snap_package.get("properties", {}).get("developer"),
             }
         self.dispatcher.publishEvent(
             "snap_package_version", snap_package_version)

=== modified file 'checkbox-support/checkbox_support/parsers/tests/fixtures/submission_snap_packages.xml'
--- checkbox-support/checkbox_support/parsers/tests/fixtures/submission_snap_packages.xml	2015-10-19 19:03:48 +0000
+++ checkbox-support/checkbox_support/parsers/tests/fixtures/submission_snap_packages.xml	2016-05-27 12:25:37 +0000
@@ -3,7 +3,6 @@
 <software>
 <snap_packages>
 <snap_package id="0" name="ubuntu-core">
-<property name="date" type="str">2015-10-13</property>
 <property name="version" type="str">14</property>
 <property name="developer" type="str">ubuntu</property>
 </snap_package>

=== added file 'checkbox-support/checkbox_support/parsers/tests/fixtures/submission_snap_packages_with_date.xml'
--- checkbox-support/checkbox_support/parsers/tests/fixtures/submission_snap_packages_with_date.xml	1970-01-01 00:00:00 +0000
+++ checkbox-support/checkbox_support/parsers/tests/fixtures/submission_snap_packages_with_date.xml	2016-05-27 12:25:37 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<system version="1.0">
+<software>
+<snap_packages>
+<snap_package id="0" name="ubuntu-core">
+<property name="version" type="str">14</property>
+<property name="date" type="str">2015-10-13</property>
+<property name="developer" type="str">ubuntu</property>
+</snap_package>
+</snap_packages>
+</software>
+</system>

=== modified file 'checkbox-support/checkbox_support/parsers/tests/test_submission.py'
--- checkbox-support/checkbox_support/parsers/tests/test_submission.py	2016-02-02 20:58:17 +0000
+++ checkbox-support/checkbox_support/parsers/tests/test_submission.py	2016-05-27 12:25:37 +0000
@@ -349,6 +349,17 @@
         package_version = result["snap_package_versions"][0]
         self.assertEqual(package_version["name"], "ubuntu-core")
         self.assertEqual(package_version["version"], "14")
+        self.assertEqual(package_version["developer"], "ubuntu")
+
+    def test_snap_package_versions_with_date(self):
+        """Snap Package parses correctly with optional date element."""
+        result = self.getResult("submission_snap_packages_with_date.xml")
+        self.assertTrue("snap_package_versions" in result)
+        self.assertEqual(len(result["snap_package_versions"]), 1)
+
+        package_version = result["snap_package_versions"][0]
+        self.assertEqual(package_version["name"], "ubuntu-core")
+        self.assertEqual(package_version["version"], "14")
         self.assertEqual(package_version["date"], "2015-10-13")
         self.assertEqual(package_version["developer"], "ubuntu")