diff -Nru click-reviewers-tools-0.6/bin/clickreviews/cr_desktop.py click-reviewers-tools-0.6/bin/clickreviews/cr_desktop.py --- click-reviewers-tools-0.6/bin/clickreviews/cr_desktop.py 2014-03-25 11:36:22.000000000 +0000 +++ click-reviewers-tools-0.6/bin/clickreviews/cr_desktop.py 2014-04-22 11:08:53.000000000 +0000 @@ -53,9 +53,10 @@ self.expected_execs = ['qmlscene', 'webbrowser-app', 'webapp-container', - 'cordova-ubuntu-2.8', 'ubuntu-html5-app-launcher', ] + self.deprecated_execs = ['cordova-ubuntu-2.8', + ] # TODO: the desktop hook will actually handle this correctly self.blacklisted_keys = ['Path'] @@ -194,8 +195,12 @@ l = 'http://askubuntu.com/questions/417381/what-does-desktop-exec-mean/417382' elif de.getExec().split()[0] not in self.expected_execs: if self.click_arch == "all": # interpreted file - s = "found unexpected Exec with architecture '%s': %s" % \ - (self.click_arch, de.getExec().split()[0]) + if de.getExec().split()[0] not in self.deprecated_execs: + s = "found unexpected Exec with architecture '%s': %s" % \ + (self.click_arch, de.getExec().split()[0]) + else: + s = "found deprecated Exec with architecture '%s': %s" % \ + (self.click_arch, de.getExec().split()[0]) t = 'warn' else: # compiled # TODO: this can be a lot smarter diff -Nru click-reviewers-tools-0.6/bin/clickreviews/tests/test_cr_desktop.py click-reviewers-tools-0.6/bin/clickreviews/tests/test_cr_desktop.py --- click-reviewers-tools-0.6/bin/clickreviews/tests/test_cr_desktop.py 2014-03-25 11:36:22.000000000 +0000 +++ click-reviewers-tools-0.6/bin/clickreviews/tests/test_cr_desktop.py 2014-04-22 11:08:53.000000000 +0000 @@ -62,6 +62,26 @@ expected_counts = {'info': 0, 'warn': 0, 'error': 1} self.check_results(r, expected_counts) + def test_check_desktop_exec_has_deprecated_exec(self): + '''Test check_desktop_exec() - Exec has deprecated exec''' + c = ClickReviewDesktop(self.test_name) + self.set_test_desktop(self.default_appname, + "Exec", "cordova-ubuntu-2.8 .") + c.check_desktop_exec() + r = c.click_report + expected_counts = {'info': 0, 'warn': 1, 'error': 0} + self.check_results(r, expected_counts) + + def test_check_desktop_file_has_valid_exec(self): + '''Test check_desktop_exec() - Exec has valid exec''' + c = ClickReviewDesktop(self.test_name) + self.set_test_desktop(self.default_appname, + "Exec", "qmlscene $@ myApp.qml") + c.check_desktop_exec() + r = c.click_report + expected_counts = {'info': 1, 'warn': 0, 'error': 0} + self.check_results(r, expected_counts) + def test_check_desktop_file_valid_empty_name(self): '''Test check_desktop_file_valid() - empty Name''' c = ClickReviewDesktop(self.test_name) diff -Nru click-reviewers-tools-0.6/clickreviews/cr_desktop.py click-reviewers-tools-0.6/clickreviews/cr_desktop.py --- click-reviewers-tools-0.6/clickreviews/cr_desktop.py 2014-03-25 11:36:22.000000000 +0000 +++ click-reviewers-tools-0.6/clickreviews/cr_desktop.py 2014-04-22 11:08:53.000000000 +0000 @@ -53,9 +53,10 @@ self.expected_execs = ['qmlscene', 'webbrowser-app', 'webapp-container', - 'cordova-ubuntu-2.8', 'ubuntu-html5-app-launcher', ] + self.deprecated_execs = ['cordova-ubuntu-2.8', + ] # TODO: the desktop hook will actually handle this correctly self.blacklisted_keys = ['Path'] @@ -194,8 +195,12 @@ l = 'http://askubuntu.com/questions/417381/what-does-desktop-exec-mean/417382' elif de.getExec().split()[0] not in self.expected_execs: if self.click_arch == "all": # interpreted file - s = "found unexpected Exec with architecture '%s': %s" % \ - (self.click_arch, de.getExec().split()[0]) + if de.getExec().split()[0] not in self.deprecated_execs: + s = "found unexpected Exec with architecture '%s': %s" % \ + (self.click_arch, de.getExec().split()[0]) + else: + s = "found deprecated Exec with architecture '%s': %s" % \ + (self.click_arch, de.getExec().split()[0]) t = 'warn' else: # compiled # TODO: this can be a lot smarter diff -Nru click-reviewers-tools-0.6/clickreviews/tests/test_cr_desktop.py click-reviewers-tools-0.6/clickreviews/tests/test_cr_desktop.py --- click-reviewers-tools-0.6/clickreviews/tests/test_cr_desktop.py 2014-03-25 11:36:22.000000000 +0000 +++ click-reviewers-tools-0.6/clickreviews/tests/test_cr_desktop.py 2014-04-22 11:08:53.000000000 +0000 @@ -62,6 +62,26 @@ expected_counts = {'info': 0, 'warn': 0, 'error': 1} self.check_results(r, expected_counts) + def test_check_desktop_exec_has_deprecated_exec(self): + '''Test check_desktop_exec() - Exec has deprecated exec''' + c = ClickReviewDesktop(self.test_name) + self.set_test_desktop(self.default_appname, + "Exec", "cordova-ubuntu-2.8 .") + c.check_desktop_exec() + r = c.click_report + expected_counts = {'info': 0, 'warn': 1, 'error': 0} + self.check_results(r, expected_counts) + + def test_check_desktop_file_has_valid_exec(self): + '''Test check_desktop_exec() - Exec has valid exec''' + c = ClickReviewDesktop(self.test_name) + self.set_test_desktop(self.default_appname, + "Exec", "qmlscene $@ myApp.qml") + c.check_desktop_exec() + r = c.click_report + expected_counts = {'info': 1, 'warn': 0, 'error': 0} + self.check_results(r, expected_counts) + def test_check_desktop_file_valid_empty_name(self): '''Test check_desktop_file_valid() - empty Name''' c = ClickReviewDesktop(self.test_name) diff -Nru click-reviewers-tools-0.6/debian/bzr-builder.manifest click-reviewers-tools-0.6/debian/bzr-builder.manifest --- click-reviewers-tools-0.6/debian/bzr-builder.manifest 2014-03-25 11:36:23.000000000 +0000 +++ click-reviewers-tools-0.6/debian/bzr-builder.manifest 2014-04-22 11:08:53.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~182 -lp:click-reviewers-tools revid:daniel.holbach@canonical.com-20140324114440-200tmgnen085e7qt +# bzr-builder format 0.3 deb-version {debupstream}-0~184 +lp:click-reviewers-tools revid:daniel.holbach@canonical.com-20140417161343-c3tkos5j2nmtk9zd diff -Nru click-reviewers-tools-0.6/debian/changelog click-reviewers-tools-0.6/debian/changelog --- click-reviewers-tools-0.6/debian/changelog 2014-03-25 11:36:23.000000000 +0000 +++ click-reviewers-tools-0.6/debian/changelog 2014-04-22 11:08:53.000000000 +0000 @@ -1,14 +1,16 @@ -click-reviewers-tools (0.6-0~182~ubuntu14.04.1) trusty; urgency=low +click-reviewers-tools (0.6-0~184~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Daniel Holbach Tue, 25 Mar 2014 11:36:23 +0000 + -- Daniel Holbach Tue, 22 Apr 2014 11:08:53 +0000 click-reviewers-tools (0.6) UNRELEASED; urgency=medium [ Daniel Holbach ] * d/control: bump apparmor-easyprof-ubuntu requirement to 1.0.44. This should safeguard against #1292418 (test-suite failing on saucy). + * clickreviews/cr_desktop.py: check for deprecated execs, add + cordova-ubuntu-2.8 to the list. (LP: #1307533) [ Jamie Strandboge ] * clickreviews/cr_security.py: webview policy can be used by webapps