Checkbox

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

  1. provider-cleanups
  2. Merge into trunk
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
1=== removed directory 'providers/2014.com.canonical.certification.meta-test/jobs'
2=== modified file 'providers/2014.com.canonical.certification.meta-test/po/POTFILES.in'
3--- providers/2014.com.canonical.certification.meta-test/po/POTFILES.in 2014-04-28 06:59:03 +0000
4+++ providers/2014.com.canonical.certification.meta-test/po/POTFILES.in 2015-03-17 15:54:16 +0000
5@@ -1,5 +1,6 @@
6 [encoding: UTF-8]
7-[type: gettext/rfc822deb] jobs/coverage.txt
8-[type: gettext/rfc822deb] jobs/support.txt
9-[type: gettext/rfc822deb] jobs/tests.txt
10+[type: gettext/rfc822deb] units/coverage.pxu
11+[type: gettext/rfc822deb] units/support.pxu
12+[type: gettext/rfc822deb] units/testplans.pxu
13+[type: gettext/rfc822deb] units/tests.pxu
14 manage.py
15
16=== added directory 'providers/2014.com.canonical.certification.meta-test/units'
17=== renamed file 'providers/2014.com.canonical.certification.meta-test/jobs/coverage.txt' => 'providers/2014.com.canonical.certification.meta-test/units/coverage.pxu'
18--- providers/2014.com.canonical.certification.meta-test/jobs/coverage.txt 2014-03-21 21:42:02 +0000
19+++ providers/2014.com.canonical.certification.meta-test/units/coverage.pxu 2015-03-17 15:54:16 +0000
20@@ -8,6 +8,7 @@
21 command:
22 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate
23 coverage erase
24+flags: preserve-locale
25
26 id: coverage/report
27 _summary: Generate code coverage report
28@@ -21,3 +22,4 @@
29 command:
30 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate
31 coverage report
32+flags: preserve-locale
33
34=== renamed file 'providers/2014.com.canonical.certification.meta-test/jobs/support.txt' => 'providers/2014.com.canonical.certification.meta-test/units/support.pxu'
35--- providers/2014.com.canonical.certification.meta-test/jobs/support.txt 2014-03-04 22:35:52 +0000
36+++ providers/2014.com.canonical.certification.meta-test/units/support.pxu 2015-03-17 15:54:16 +0000
37@@ -6,5 +6,7 @@
38 temporary directory unique to each testing session.
39 plugin: shell
40 estimated_duration: 14.0
41-environ: CHECKBOX_TOP
42-command: $CHECKBOX_TOP/mk-venv $PLAINBOX_SESSION_SHARE/virtualenv
43+command:
44+ export CHECKBOX_TOP=$PLAINBOX_PROVIDER_UNITS/../../..
45+ $CHECKBOX_TOP/mk-venv $PLAINBOX_SESSION_SHARE/virtualenv
46+flags: preserve-locale
47
48=== added file 'providers/2014.com.canonical.certification.meta-test/units/testplans.pxu'
49--- providers/2014.com.canonical.certification.meta-test/units/testplans.pxu 1970-01-01 00:00:00 +0000
50+++ providers/2014.com.canonical.certification.meta-test/units/testplans.pxu 2015-03-17 15:54:16 +0000
51@@ -0,0 +1,8 @@
52+unit: test plan
53+id: default
54+_name: Tests and test coverage
55+_description:
56+ This test plan runs all of the unit tests and computes test coverage.
57+include:
58+ .*/unit-tests
59+ coverage/report
60
61=== renamed file 'providers/2014.com.canonical.certification.meta-test/jobs/tests.txt' => 'providers/2014.com.canonical.certification.meta-test/units/tests.pxu'
62--- providers/2014.com.canonical.certification.meta-test/jobs/tests.txt 2014-03-21 21:42:02 +0000
63+++ providers/2014.com.canonical.certification.meta-test/units/tests.pxu 2015-03-17 15:54:16 +0000
64@@ -14,8 +14,11 @@
65 estimated_duration: 5.0
66 command:
67 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate
68+ export LANGUAGE=en
69+ export LANG=C.UTF-8
70 coverage run --append --branch \
71 --module plainbox self-test --after-reexec --quiet --unit-tests
72+flags: preserve-locale
73
74 id: plainbox/integration-tests
75 _summary: PlainBox Integration Tests
76@@ -31,6 +34,8 @@
77 This test depends on the test that resets coverage data.
78 command:
79 . $PLAINBOX_SESSION_SHARE/virtualenv/bin/activate
80+ export LANGUAGE=en
81+ export LANG=C.UTF-8
82 coverage run --append --branch \
83 --module plainbox self-test --after-reexec --quiet --integration-tests
84 depends:
85@@ -38,3 +43,4 @@
86 coverage/erase
87 plugin: shell
88 estimated_duration: 1.0
89+flags: preserve-locale
90
91=== removed directory 'providers/2014.com.canonical.certification.meta-test/whitelists'
92=== removed file 'providers/2014.com.canonical.certification.meta-test/whitelists/unit-tests.whitelist'
93--- providers/2014.com.canonical.certification.meta-test/whitelists/unit-tests.whitelist 2014-02-25 20:16:41 +0000
94+++ providers/2014.com.canonical.certification.meta-test/whitelists/unit-tests.whitelist 1970-01-01 00:00:00 +0000
95@@ -1,2 +0,0 @@
96-.*/unit-tests
97-coverage/report
98
99=== modified file 'providers/plainbox-provider-certification-client/manage.py'
100--- providers/plainbox-provider-certification-client/manage.py 2015-02-10 09:37:15 +0000
101+++ providers/plainbox-provider-certification-client/manage.py 2015-03-17 15:54:16 +0000
102@@ -81,4 +81,6 @@
103 version="1.0",
104 description=N_("Client Certification provider"),
105 gettext_domain="2013_com_canonical_certification_certification-client",
106+ deprecated=False,
107+ strict=False
108 )
109
110=== modified file 'providers/plainbox-provider-certification-server/manage.py'
111--- providers/plainbox-provider-certification-server/manage.py 2015-02-10 09:37:15 +0000
112+++ providers/plainbox-provider-certification-server/manage.py 2015-03-17 15:54:16 +0000
113@@ -81,4 +81,5 @@
114 version="1.0",
115 description=N_("Server Certification provider"),
116 gettext_domain="2013_com_canonical_certification_certification-server",
117+ strict=False, deprecated=False,
118 )

Subscribers

People subscribed via source and target branches