Merge lp:~zyga/checkbox/provider-cleanups into lp:checkbox

Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 3624
Merged at revision: 3621
Proposed branch: lp:~zyga/checkbox/provider-cleanups
Merge into: lp:checkbox
Diff against target: 118 lines (+27/-7)
8 files modified
providers/2014.com.canonical.certification.meta-test/po/POTFILES.in (+4/-3)
providers/2014.com.canonical.certification.meta-test/units/coverage.pxu (+2/-0)
providers/2014.com.canonical.certification.meta-test/units/support.pxu (+4/-2)
providers/2014.com.canonical.certification.meta-test/units/testplans.pxu (+8/-0)
providers/2014.com.canonical.certification.meta-test/units/tests.pxu (+6/-0)
providers/2014.com.canonical.certification.meta-test/whitelists/unit-tests.whitelist (+0/-2)
providers/plainbox-provider-certification-client/manage.py (+2/-0)
providers/plainbox-provider-certification-server/manage.py (+1/-0)
To merge this branch: bzr merge lp:~zyga/checkbox/provider-cleanups
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+253235@code.launchpad.net

Description of the change

Just some small changes to the meta provider and a harmless prevention change to normal providers.

9605a86 providers: disable strict validation
0c11031 providers:meta: add preserve-locale flag
32b701c providers:meta: use .pxu for al units
071bc0a providers:meta: convert to test plans
882fbfd providers:meta: fix virtualenv creation
13e9e93 providers:meta: disable i18n for testing

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Self approve, this is harmless and I need it for stuff

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed directory 'providers/2014.com.canonical.certification.meta-test/jobs'
=== modified file 'providers/2014.com.canonical.certification.meta-test/po/POTFILES.in'
--- providers/2014.com.canonical.certification.meta-test/po/POTFILES.in 2014-04-28 06:59:03 +0000
+++ providers/2014.com.canonical.certification.meta-test/po/POTFILES.in 2015-03-17 15:54:16 +0000
@@ -1,5 +1,6 @@
1[encoding: UTF-8]1[encoding: UTF-8]
2[type: gettext/rfc822deb] jobs/coverage.txt2[type: gettext/rfc822deb] units/coverage.pxu
3[type: gettext/rfc822deb] jobs/support.txt3[type: gettext/rfc822deb] units/support.pxu
4[type: gettext/rfc822deb] jobs/tests.txt4[type: gettext/rfc822deb] units/testplans.pxu
5[type: gettext/rfc822deb] units/tests.pxu
5manage.py6manage.py
67
=== added directory 'providers/2014.com.canonical.certification.meta-test/units'
=== renamed file 'providers/2014.com.canonical.certification.meta-test/jobs/coverage.txt' => 'providers/2014.com.canonical.certification.meta-test/units/coverage.pxu'
--- providers/2014.com.canonical.certification.meta-test/jobs/coverage.txt 2014-03-21 21:42:02 +0000
+++ providers/2014.com.canonical.certification.meta-test/units/coverage.pxu 2015-03-17 15:54:16 +0000
@@ -8,6 +8,7 @@
8command:8command:
9 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate9 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate
10 coverage erase10 coverage erase
11flags: preserve-locale
1112
12id: coverage/report13id: coverage/report
13_summary: Generate code coverage report14_summary: Generate code coverage report
@@ -21,3 +22,4 @@
21command:22command:
22 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate23 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate
23 coverage report24 coverage report
25flags: preserve-locale
2426
=== renamed file 'providers/2014.com.canonical.certification.meta-test/jobs/support.txt' => 'providers/2014.com.canonical.certification.meta-test/units/support.pxu'
--- providers/2014.com.canonical.certification.meta-test/jobs/support.txt 2014-03-04 22:35:52 +0000
+++ providers/2014.com.canonical.certification.meta-test/units/support.pxu 2015-03-17 15:54:16 +0000
@@ -6,5 +6,7 @@
6 temporary directory unique to each testing session.6 temporary directory unique to each testing session.
7plugin: shell7plugin: shell
8estimated_duration: 14.08estimated_duration: 14.0
9environ: CHECKBOX_TOP9command:
10command: $CHECKBOX_TOP/mk-venv $PLAINBOX_SESSION_SHARE/virtualenv10 export CHECKBOX_TOP=$PLAINBOX_PROVIDER_UNITS/../../..
11 $CHECKBOX_TOP/mk-venv $PLAINBOX_SESSION_SHARE/virtualenv
12flags: preserve-locale
1113
=== added file 'providers/2014.com.canonical.certification.meta-test/units/testplans.pxu'
--- providers/2014.com.canonical.certification.meta-test/units/testplans.pxu 1970-01-01 00:00:00 +0000
+++ providers/2014.com.canonical.certification.meta-test/units/testplans.pxu 2015-03-17 15:54:16 +0000
@@ -0,0 +1,8 @@
1unit: test plan
2id: default
3_name: Tests and test coverage
4_description:
5 This test plan runs all of the unit tests and computes test coverage.
6include:
7 .*/unit-tests
8 coverage/report
09
=== renamed file 'providers/2014.com.canonical.certification.meta-test/jobs/tests.txt' => 'providers/2014.com.canonical.certification.meta-test/units/tests.pxu'
--- providers/2014.com.canonical.certification.meta-test/jobs/tests.txt 2014-03-21 21:42:02 +0000
+++ providers/2014.com.canonical.certification.meta-test/units/tests.pxu 2015-03-17 15:54:16 +0000
@@ -14,8 +14,11 @@
14estimated_duration: 5.014estimated_duration: 5.0
15command:15command:
16 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate16 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate
17 export LANGUAGE=en
18 export LANG=C.UTF-8
17 coverage run --append --branch \19 coverage run --append --branch \
18 --module plainbox self-test --after-reexec --quiet --unit-tests20 --module plainbox self-test --after-reexec --quiet --unit-tests
21flags: preserve-locale
1922
20id: plainbox/integration-tests23id: plainbox/integration-tests
21_summary: PlainBox Integration Tests24_summary: PlainBox Integration Tests
@@ -31,6 +34,8 @@
31 This test depends on the test that resets coverage data.34 This test depends on the test that resets coverage data.
32command:35command:
33 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate36 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate
37 export LANGUAGE=en
38 export LANG=C.UTF-8
34 coverage run --append --branch \39 coverage run --append --branch \
35 --module plainbox self-test --after-reexec --quiet --integration-tests40 --module plainbox self-test --after-reexec --quiet --integration-tests
36depends:41depends:
@@ -38,3 +43,4 @@
38 coverage/erase43 coverage/erase
39plugin: shell44plugin: shell
40estimated_duration: 1.045estimated_duration: 1.0
46flags: preserve-locale
4147
=== removed directory 'providers/2014.com.canonical.certification.meta-test/whitelists'
=== removed file 'providers/2014.com.canonical.certification.meta-test/whitelists/unit-tests.whitelist'
--- providers/2014.com.canonical.certification.meta-test/whitelists/unit-tests.whitelist 2014-02-25 20:16:41 +0000
+++ providers/2014.com.canonical.certification.meta-test/whitelists/unit-tests.whitelist 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1.*/unit-tests
2coverage/report
30
=== modified file 'providers/plainbox-provider-certification-client/manage.py'
--- providers/plainbox-provider-certification-client/manage.py 2015-02-10 09:37:15 +0000
+++ providers/plainbox-provider-certification-client/manage.py 2015-03-17 15:54:16 +0000
@@ -81,4 +81,6 @@
81 version="1.0",81 version="1.0",
82 description=N_("Client Certification provider"),82 description=N_("Client Certification provider"),
83 gettext_domain="2013_com_canonical_certification_certification-client",83 gettext_domain="2013_com_canonical_certification_certification-client",
84 deprecated=False,
85 strict=False
84)86)
8587
=== modified file 'providers/plainbox-provider-certification-server/manage.py'
--- providers/plainbox-provider-certification-server/manage.py 2015-02-10 09:37:15 +0000
+++ providers/plainbox-provider-certification-server/manage.py 2015-03-17 15:54:16 +0000
@@ -81,4 +81,5 @@
81 version="1.0",81 version="1.0",
82 description=N_("Server Certification provider"),82 description=N_("Server Certification provider"),
83 gettext_domain="2013_com_canonical_certification_certification-server",83 gettext_domain="2013_com_canonical_certification_certification-server",
84 strict=False, deprecated=False,
84)85)

Subscribers

People subscribed via source and target branches