Provider for Plainbox - Ubuntu Touch

Merge ~kissiel/plainbox-provider-ubuntu-touch:year-prefix-removal into plainbox-provider-ubuntu-touch:master

  1. Git
  2. lp:~kissiel/plainbox-provider-ubuntu-touch
  3. year-prefix-removal
  4. Merge into master
Proposed by Maciej Kisielewski
Status: Rejected
Rejected by: Maciej Kisielewski
Proposed branch: ~kissiel/plainbox-provider-ubuntu-touch:year-prefix-removal
Merge into: plainbox-provider-ubuntu-touch:master
Diff against target: 240 lines (+61/-61)
5 files modified
manage.py (+1/-1)
units/qml-tests.pxu (+8/-8)
units/shakedown.pxu (+48/-48)
units/tst.pxu (+2/-2)
units/uls.pxu (+2/-2)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+326993@code.launchpad.net

Description of the change

another year prefix removal

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Unmerged commits

27ae979... by Maciej Kisielewski

remove year prefix from provider's namespace

Signed-off-by: Maciej Kisielewski <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/manage.py b/manage.py
index 0f01e5a..656c632 100755
--- a/manage.py
+++ b/manage.py
@@ -21,7 +21,7 @@
21from plainbox.provider_manager import setup, N_21from plainbox.provider_manager import setup, N_
2222
23setup(23setup(
24 name='2014.com.ubuntu:ubuntu-touch',24 name='com.ubuntu:ubuntu-touch',
25 version="1.1",25 version="1.1",
26 description=N_("The Ubuntu Touch for Plainbox"),26 description=N_("The Ubuntu Touch for Plainbox"),
27 gettext_domain="plainbox-provider-ubuntu-touch",27 gettext_domain="plainbox-provider-ubuntu-touch",
diff --git a/units/qml-tests.pxu b/units/qml-tests.pxu
index 09e6a96..5139e2f 100644
--- a/units/qml-tests.pxu
+++ b/units/qml-tests.pxu
@@ -136,7 +136,7 @@ _description:
136 This test verifies that you can send an SMS136 This test verifies that you can send an SMS
137qml_file: msg-01.qml137qml_file: msg-01.qml
138estimated_duration: 20138estimated_duration: 20
139imports: from 2014.com.ubuntu import cellularmodem as modem139imports: from com.ubuntu import cellularmodem as modem
140requires: modem.ril0_simPresent == "True"140requires: modem.ril0_simPresent == "True"
141141
142id: msg-15142id: msg-15
@@ -147,7 +147,7 @@ _description:
147 This test verifies that you can send an SMS147 This test verifies that you can send an SMS
148qml_file: msg-15.qml148qml_file: msg-15.qml
149estimated_duration: 20149estimated_duration: 20
150imports: from 2014.com.ubuntu import cellularmodem as modem150imports: from com.ubuntu import cellularmodem as modem
151requires: modem.ril1_simPresent == "True"151requires: modem.ril1_simPresent == "True"
152152
153id: msg-06153id: msg-06
@@ -158,7 +158,7 @@ _description:
158 This test verifies that you can send an SMS containing special characters158 This test verifies that you can send an SMS containing special characters
159qml_file: msg-06.qml159qml_file: msg-06.qml
160estimated_duration: 20160estimated_duration: 20
161imports: from 2014.com.ubuntu import cellularmodem as modem161imports: from com.ubuntu import cellularmodem as modem
162requires: modem.ril0_simPresent == "True"162requires: modem.ril0_simPresent == "True"
163163
164id: msg-20164id: msg-20
@@ -169,7 +169,7 @@ _description:
169 This test verifies that you can send an SMS containing special characters169 This test verifies that you can send an SMS containing special characters
170qml_file: msg-20.qml170qml_file: msg-20.qml
171estimated_duration: 20171estimated_duration: 20
172imports: from 2014.com.ubuntu import cellularmodem as modem172imports: from com.ubuntu import cellularmodem as modem
173requires: modem.ril1_simPresent == "True"173requires: modem.ril1_simPresent == "True"
174174
175id: msg-07175id: msg-07
@@ -180,7 +180,7 @@ _description:
180 This test verifies that you can send an SMS containing an & (ampersand) and that it is displayed correctly180 This test verifies that you can send an SMS containing an & (ampersand) and that it is displayed correctly
181qml_file: msg-07.qml181qml_file: msg-07.qml
182estimated_duration: 20182estimated_duration: 20
183imports: from 2014.com.ubuntu import cellularmodem as modem183imports: from com.ubuntu import cellularmodem as modem
184requires: modem.ril0_simPresent == "True"184requires: modem.ril0_simPresent == "True"
185185
186id: msg-21186id: msg-21
@@ -191,7 +191,7 @@ _description:
191 This test verifies that you can send an SMS containing an & (ampersand) and that it is displayed correctly191 This test verifies that you can send an SMS containing an & (ampersand) and that it is displayed correctly
192qml_file: msg-21.qml192qml_file: msg-21.qml
193estimated_duration: 20193estimated_duration: 20
194imports: from 2014.com.ubuntu import cellularmodem as modem194imports: from com.ubuntu import cellularmodem as modem
195requires: modem.ril1_simPresent == "True"195requires: modem.ril1_simPresent == "True"
196196
197id: msg-08197id: msg-08
@@ -202,7 +202,7 @@ _description:
202 This test verifies that you can send an SMS containing a URL and some other text and that it is displayed correctly202 This test verifies that you can send an SMS containing a URL and some other text and that it is displayed correctly
203qml_file: msg-08.qml203qml_file: msg-08.qml
204estimated_duration: 20204estimated_duration: 20
205imports: from 2014.com.ubuntu import cellularmodem as modem205imports: from com.ubuntu import cellularmodem as modem
206requires: modem.ril0_simPresent == "True"206requires: modem.ril0_simPresent == "True"
207207
208id: msg-22208id: msg-22
@@ -213,7 +213,7 @@ _description:
213 This test verifies that you can send an SMS containing a URL and some other text and that it is displayed correctly213 This test verifies that you can send an SMS containing a URL and some other text and that it is displayed correctly
214qml_file: msg-22.qml214qml_file: msg-22.qml
215estimated_duration: 20215estimated_duration: 20
216imports: from 2014.com.ubuntu import cellularmodem as modem216imports: from com.ubuntu import cellularmodem as modem
217requires: modem.ril1_simPresent == "True"217requires: modem.ril1_simPresent == "True"
218218
219unit: category219unit: category
diff --git a/units/shakedown.pxu b/units/shakedown.pxu
index 4a01efd..bb4a455 100644
--- a/units/shakedown.pxu
+++ b/units/shakedown.pxu
@@ -8,54 +8,54 @@ _description:
8 This test plan should be used when the device is returned, to establish if8 This test plan should be used when the device is returned, to establish if
9 it was returned because there's a technical problem with the device.9 it was returned because there's a technical problem with the device.
10include:10include:
11 2014.com.ubuntu::Audio-0411 com.ubuntu::Audio-04
12 2014.com.ubuntu::Audio-0512 com.ubuntu::Audio-05
13 2014.com.ubuntu::Audio-0613 com.ubuntu::Audio-06
14 2014.com.ubuntu::Audio-0714 com.ubuntu::Audio-07
15 2014.com.ubuntu::Audio-0815 com.ubuntu::Audio-08
16 2014.com.ubuntu::Audio-1816 com.ubuntu::Audio-18
17 2014.com.ubuntu::Audio-1917 com.ubuntu::Audio-19
18 2014.com.ubuntu::Battery-0618 com.ubuntu::Battery-06
19 2014.com.ubuntu::Bluetooth-0119 com.ubuntu::Bluetooth-01
20 2014.com.ubuntu::Bluetooth-0220 com.ubuntu::Bluetooth-02
21 2014.com.ubuntu::Bluetooth-0321 com.ubuntu::Bluetooth-03
22 2014.com.ubuntu::Bluetooth-0422 com.ubuntu::Bluetooth-04
23 2014.com.ubuntu::Bluetooth-0523 com.ubuntu::Bluetooth-05
24 2014.com.ubuntu::ID-Location-0324 com.ubuntu::ID-Location-03
25 2014.com.ubuntu::ID-Location-0425 com.ubuntu::ID-Location-04
26 2014.com.ubuntu::Msg-0126 com.ubuntu::Msg-01
27 2014.com.ubuntu::Msg-0227 com.ubuntu::Msg-02
28 2014.com.ubuntu::Msg-0328 com.ubuntu::Msg-03
29 2014.com.ubuntu::Msg-1129 com.ubuntu::Msg-11
30 2014.com.ubuntu::Msg-1230 com.ubuntu::Msg-12
31 2014.com.ubuntu::Msg-1331 com.ubuntu::Msg-13
32 2014.com.ubuntu::SD-0132 com.ubuntu::SD-01
33 2014.com.ubuntu::SD-0233 com.ubuntu::SD-02
34 2014.com.ubuntu::SD-0634 com.ubuntu::SD-06
35 2014.com.ubuntu::SD-0735 com.ubuntu::SD-07
36 2014.com.ubuntu::Screen-0736 com.ubuntu::Screen-07
37 2014.com.ubuntu::Screen-0837 com.ubuntu::Screen-08
38 2014.com.ubuntu::Screen-0938 com.ubuntu::Screen-09
39 2014.com.ubuntu::Screen-1039 com.ubuntu::Screen-10
40 2014.com.ubuntu::Screen-1140 com.ubuntu::Screen-11
41 2014.com.ubuntu::Sensors-0141 com.ubuntu::Sensors-01
42 2014.com.ubuntu::Sensors-0242 com.ubuntu::Sensors-02
43 2014.com.ubuntu::Sensors-0343 com.ubuntu::Sensors-03
44 2014.com.ubuntu::Sensors-0444 com.ubuntu::Sensors-04
45 2014.com.ubuntu::Sensors-0745 com.ubuntu::Sensors-07
46 2014.com.ubuntu::Settings-0146 com.ubuntu::Settings-01
47 2014.com.ubuntu::Tel-0147 com.ubuntu::Tel-01
48 2014.com.ubuntu::Tel-3648 com.ubuntu::Tel-36
49 2014.com.ubuntu::Tel-3849 com.ubuntu::Tel-38
50 2014.com.ubuntu::Tel-4650 com.ubuntu::Tel-46
51 2014.com.ubuntu::Tel-4751 com.ubuntu::Tel-47
52 2014.com.ubuntu::Tel-4852 com.ubuntu::Tel-48
53 2014.com.ubuntu::Tel-4953 com.ubuntu::Tel-49
54 2014.com.ubuntu::Tel-5054 com.ubuntu::Tel-50
55 2014.com.ubuntu::Tel-5155 com.ubuntu::Tel-51
56 2014.com.ubuntu::Tel-5256 com.ubuntu::Tel-52
57 2014.com.ubuntu::Tel-5357 com.ubuntu::Tel-53
58 2014.com.ubuntu::Wifi-1158 com.ubuntu::Wifi-11
59 shakedown/.*59 shakedown/.*
6060
61unit: category61unit: category
diff --git a/units/tst.pxu b/units/tst.pxu
index 700817d..6e2ff15 100644
--- a/units/tst.pxu
+++ b/units/tst.pxu
@@ -12,7 +12,7 @@ _description: Generates Trust Store tests
12unit: template12unit: template
13template-resource: tst/tst_resource13template-resource: tst/tst_resource
14id: tst/{binary}_{full_name}14id: tst/{binary}_{full_name}
15template-imports: from 2014.com.ubuntu import tst/tst_resource as tst_res15template-imports: from com.ubuntu import tst/tst_resource as tst_res
16template-filter: tst_res.root == 'yes'16template-filter: tst_res.root == 'yes'
17category_id: tst17category_id: tst
18plugin: shell18plugin: shell
@@ -23,7 +23,7 @@ _description: {test_case} from Ubuntu Location Service tests
23unit: template23unit: template
24template-resource: tst/tst_resource24template-resource: tst/tst_resource
25id: tst/{binary}_{full_name}25id: tst/{binary}_{full_name}
26template-imports: from 2014.com.ubuntu import tst/tst_resource as tst_res26template-imports: from com.ubuntu import tst/tst_resource as tst_res
27template-filter: tst_res.root == 'no'27template-filter: tst_res.root == 'no'
28category_id: tst28category_id: tst
29plugin: shell29plugin: shell
diff --git a/units/uls.pxu b/units/uls.pxu
index 6b02411..9f95d85 100644
--- a/units/uls.pxu
+++ b/units/uls.pxu
@@ -12,7 +12,7 @@ _description: Generates Ubuntu Location Services tests
12unit: template12unit: template
13template-resource: uls/uls_resource13template-resource: uls/uls_resource
14id: uls/{binary}_{full_name}14id: uls/{binary}_{full_name}
15template-imports: from 2014.com.ubuntu import uls/uls_resource as uls_res15template-imports: from com.ubuntu import uls/uls_resource as uls_res
16template-filter: uls_res.root == 'yes'16template-filter: uls_res.root == 'yes'
17category_id: uls17category_id: uls
18plugin: shell18plugin: shell
@@ -23,7 +23,7 @@ _description: {test_case} from Ubuntu Location Service tests
23unit: template23unit: template
24template-resource: uls/uls_resource24template-resource: uls/uls_resource
25id: uls/{binary}_{full_name}25id: uls/{binary}_{full_name}
26template-imports: from 2014.com.ubuntu import uls/uls_resource as uls_res26template-imports: from com.ubuntu import uls/uls_resource as uls_res
27template-filter: uls_res.root == 'no'27template-filter: uls_res.root == 'no'
28category_id: uls28category_id: uls
29plugin: shell29plugin: shell

Subscribers

People subscribed via source and target branches