Unity 8

Merge lp:~saviq/unity8/rename-connectivity into lp:unity8

  1. rename-connectivity
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1204
Merged at revision: 1202
Proposed branch: lp:~saviq/unity8/rename-connectivity
Merge into: lp:unity8
Diff against target: 196 lines (+22/-15)
14 files modified
plugins/Ubuntu/CMakeLists.txt (+0/-1)
plugins/Unity/CMakeLists.txt (+1/-0)
plugins/Unity/Connectivity/CMakeLists.txt (+1/-1)
plugins/Unity/Connectivity/Connectivity.qmltypes (+4/-2)
plugins/Unity/Connectivity/plugin.cpp (+1/-1)
plugins/Unity/Connectivity/qmldir (+1/-1)
qml/Shell.qml (+3/-2)
tests/mocks/Ubuntu/CMakeLists.txt (+0/-1)
tests/mocks/Unity/CMakeLists.txt (+1/-0)
tests/mocks/Unity/Connectivity/CMakeLists.txt (+1/-1)
tests/mocks/Unity/Connectivity/Connectivity.qmltypes (+4/-2)
tests/mocks/Unity/Connectivity/plugin.cpp (+1/-1)
tests/mocks/Unity/Connectivity/qmldir (+1/-1)
tests/qmltests/tst_Shell.qml (+3/-1)
To merge this branch: bzr merge lp:~saviq/unity8/rename-connectivity
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Approve
Antti Kaijanmäki (community) Abstain
Review via email: mp+232058@code.launchpad.net

Commit message

Rename Ubuntu.Connectivity to Unity.Connectivity to avoid name clash

Also disable SIM unlock on boot, it's not ready in the service yet.

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N
 * If you changed the UI, has there been a design review?
N

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

inline

review: Needs Information
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

LGTM as my request of disabling the automatic sim unlocking is included.

review: Abstain
Revision history for this message
Michał Sawicz (saviq) :
Revision history for this message
Michael Zanetti (mzanetti) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

waiting

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1202
http://jenkins.qa.ubuntu.com/job/unity8-ci/4075/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3981
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3826
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5231
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12025

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4075/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) :
review: Approve
Revision history for this message
Michael Zanetti (mzanetti) wrote :

fails a test

review: Needs Fixing
Revision history for this message
Michael Zanetti (mzanetti) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1204
http://jenkins.qa.ubuntu.com/job/unity8-ci/4079/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3990
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3836
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5240
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12038

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4079/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Ubuntu/CMakeLists.txt'
2--- plugins/Ubuntu/CMakeLists.txt 2014-08-15 18:41:51 +0000
3+++ plugins/Ubuntu/CMakeLists.txt 2014-08-25 13:04:52 +0000
4@@ -1,4 +1,3 @@
5-add_subdirectory(Connectivity)
6 add_subdirectory(Gestures)
7 add_subdirectory(DownloadDaemonListener)
8 add_subdirectory(Payments)
9
10=== modified file 'plugins/Unity/CMakeLists.txt'
11--- plugins/Unity/CMakeLists.txt 2014-07-24 16:02:27 +0000
12+++ plugins/Unity/CMakeLists.txt 2014-08-25 13:04:52 +0000
13@@ -1,3 +1,4 @@
14+add_subdirectory(Connectivity)
15 add_subdirectory(Indicators)
16 add_subdirectory(Launcher)
17 add_subdirectory(Session)
18
19=== renamed directory 'plugins/Ubuntu/Connectivity' => 'plugins/Unity/Connectivity'
20=== modified file 'plugins/Unity/Connectivity/CMakeLists.txt'
21--- plugins/Ubuntu/Connectivity/CMakeLists.txt 2014-08-15 18:41:51 +0000
22+++ plugins/Unity/Connectivity/CMakeLists.txt 2014-08-25 13:04:52 +0000
23@@ -7,4 +7,4 @@
24
25 qt5_use_modules(Connectivity Qml DBus Core)
26
27-add_unity8_plugin(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS Connectivity)
28+add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
29
30=== modified file 'plugins/Unity/Connectivity/Connectivity.qmltypes'
31--- plugins/Ubuntu/Connectivity/Connectivity.qmltypes 2014-08-15 18:41:51 +0000
32+++ plugins/Unity/Connectivity/Connectivity.qmltypes 2014-08-25 13:04:52 +0000
33@@ -4,13 +4,15 @@
34 // It is used for QML tooling purposes only.
35 //
36 // This file was auto-generated by:
37-// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'
38+// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 plugins'
39
40 Module {
41 Component {
42 name: "Connectivity"
43 prototype: "QObject"
44- exports: ["Ubuntu.Connectivity/Connectivity 0.1"]
45+ exports: ["Unity.Connectivity/Connectivity 0.1"]
46+ isCreatable: false
47+ isSingleton: true
48 exportMetaObjectRevisions: [0]
49 Method { name: "unlockAllModems" }
50 }
51
52=== modified file 'plugins/Unity/Connectivity/plugin.cpp'
53--- plugins/Ubuntu/Connectivity/plugin.cpp 2014-08-15 18:41:51 +0000
54+++ plugins/Unity/Connectivity/plugin.cpp 2014-08-25 13:04:52 +0000
55@@ -28,7 +28,7 @@
56
57 void BackendPlugin::registerTypes(const char *uri)
58 {
59- Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));
60+ Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
61
62 qmlRegisterSingletonType<Connectivity>(uri, 0, 1, "Connectivity", service_provider);
63 }
64
65=== modified file 'plugins/Unity/Connectivity/qmldir'
66--- plugins/Ubuntu/Connectivity/qmldir 2014-08-15 18:41:51 +0000
67+++ plugins/Unity/Connectivity/qmldir 2014-08-25 13:04:52 +0000
68@@ -1,3 +1,3 @@
69-module Ubuntu.Connectivity
70+module Unity.Connectivity
71 plugin Connectivity
72 typeinfo Connectivity.qmltypes
73
74=== modified file 'qml/Shell.qml'
75--- qml/Shell.qml 2014-08-22 09:28:47 +0000
76+++ qml/Shell.qml 2014-08-25 13:04:52 +0000
77@@ -20,9 +20,9 @@
78 import Unity.Application 0.1
79 import Ubuntu.Components 0.1
80 import Ubuntu.Components.Popups 1.0
81-import Ubuntu.Connectivity 0.1
82 import Ubuntu.Gestures 0.1
83 import Ubuntu.SystemImage 0.1
84+import Unity.Connectivity 0.1
85 import Unity.Launcher 0.1
86 import Utils 0.1
87 import LightDM 0.1 as LightDM
88@@ -421,9 +421,10 @@
89 }
90 }
91
92+ /* TODO re-enable when the corresponding changes in the service land (LP: #1361074)
93 Component.onCompleted: {
94 Connectivity.unlockAllModems()
95- }
96+ } */
97
98 onUnlocked: greeter.hide()
99 onSelected: {
100
101=== modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
102--- tests/mocks/Ubuntu/CMakeLists.txt 2014-08-15 18:41:51 +0000
103+++ tests/mocks/Ubuntu/CMakeLists.txt 2014-08-25 13:04:52 +0000
104@@ -1,4 +1,3 @@
105-add_subdirectory(Connectivity)
106 add_subdirectory(DownloadDaemonListener)
107 add_subdirectory(Payments)
108 add_subdirectory(SystemImage)
109
110=== modified file 'tests/mocks/Unity/CMakeLists.txt'
111--- tests/mocks/Unity/CMakeLists.txt 2014-08-07 15:29:12 +0000
112+++ tests/mocks/Unity/CMakeLists.txt 2014-08-25 13:04:52 +0000
113@@ -1,4 +1,5 @@
114 add_subdirectory(Application)
115+add_subdirectory(Connectivity)
116 add_subdirectory(Indicators)
117 add_subdirectory(Launcher)
118 add_subdirectory(Notifications)
119
120=== renamed directory 'tests/mocks/Ubuntu/Connectivity' => 'tests/mocks/Unity/Connectivity'
121=== modified file 'tests/mocks/Unity/Connectivity/CMakeLists.txt'
122--- tests/mocks/Ubuntu/Connectivity/CMakeLists.txt 2014-08-15 18:41:51 +0000
123+++ tests/mocks/Unity/Connectivity/CMakeLists.txt 2014-08-25 13:04:52 +0000
124@@ -7,4 +7,4 @@
125
126 qt5_use_modules(MockConnectivity Qml Quick Core)
127
128-add_unity8_mock(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS MockConnectivity)
129+add_unity8_mock(Unity.Connectivity 0.1 Unity/Connectivity TARGETS MockConnectivity)
130
131=== modified file 'tests/mocks/Unity/Connectivity/Connectivity.qmltypes'
132--- tests/mocks/Ubuntu/Connectivity/Connectivity.qmltypes 2014-08-15 18:41:51 +0000
133+++ tests/mocks/Unity/Connectivity/Connectivity.qmltypes 2014-08-25 13:04:52 +0000
134@@ -4,13 +4,15 @@
135 // It is used for QML tooling purposes only.
136 //
137 // This file was auto-generated by:
138-// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'
139+// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 tests/mocks'
140
141 Module {
142 Component {
143 name: "MockConnectivity"
144 prototype: "QObject"
145- exports: ["Ubuntu.Connectivity/Connectivity 0.1"]
146+ exports: ["Unity.Connectivity/Connectivity 0.1"]
147+ isCreatable: false
148+ isSingleton: true
149 exportMetaObjectRevisions: [0]
150 Signal { name: "unlockingAllModems" }
151 Method { name: "unlockAllModems" }
152
153=== modified file 'tests/mocks/Unity/Connectivity/plugin.cpp'
154--- tests/mocks/Ubuntu/Connectivity/plugin.cpp 2014-08-15 18:41:51 +0000
155+++ tests/mocks/Unity/Connectivity/plugin.cpp 2014-08-25 13:04:52 +0000
156@@ -28,7 +28,7 @@
157
158 void BackendPlugin::registerTypes(const char *uri)
159 {
160- Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));
161+ Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
162
163 qmlRegisterSingletonType<MockConnectivity>(uri, 0, 1, "Connectivity", service_provider);
164 }
165
166=== modified file 'tests/mocks/Unity/Connectivity/qmldir'
167--- tests/mocks/Ubuntu/Connectivity/qmldir 2014-08-15 18:41:51 +0000
168+++ tests/mocks/Unity/Connectivity/qmldir 2014-08-25 13:04:52 +0000
169@@ -1,3 +1,3 @@
170-module Ubuntu.Connectivity
171+module Unity.Connectivity
172 plugin MockConnectivity
173 typeinfo Connectivity.qmltypes
174
175=== modified file 'tests/qmltests/tst_Shell.qml'
176--- tests/qmltests/tst_Shell.qml 2014-08-21 14:46:12 +0000
177+++ tests/qmltests/tst_Shell.qml 2014-08-25 13:04:52 +0000
178@@ -21,8 +21,8 @@
179 import QtTest 1.0
180 import GSettings 1.0
181 import LightDM 0.1 as LightDM
182-import Ubuntu.Connectivity 0.1
183 import Unity.Application 0.1
184+import Unity.Connectivity 0.1
185 import Unity.Test 0.1 as UT
186 import Powerd 0.1
187
188@@ -460,6 +460,8 @@
189 unlockAllModemsSpy.clear()
190 // actually create an object so we notice the onCompleted signal
191 var greeter = shellComponent.createObject(root)
192+ // TODO reenable when service ready (LP: #1361074)
193+ expectFail("", "Unlock on boot temporarily disabled");
194 tryCompare(unlockAllModemsSpy, "count", 1)
195 greeter.destroy()
196 }

Subscribers

People subscribed via source and target branches