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
=== modified file 'plugins/Ubuntu/CMakeLists.txt'
--- plugins/Ubuntu/CMakeLists.txt 2014-08-15 18:41:51 +0000
+++ plugins/Ubuntu/CMakeLists.txt 2014-08-25 13:04:52 +0000
@@ -1,4 +1,3 @@
1add_subdirectory(Connectivity)
2add_subdirectory(Gestures)1add_subdirectory(Gestures)
3add_subdirectory(DownloadDaemonListener)2add_subdirectory(DownloadDaemonListener)
4add_subdirectory(Payments)3add_subdirectory(Payments)
54
=== modified file 'plugins/Unity/CMakeLists.txt'
--- plugins/Unity/CMakeLists.txt 2014-07-24 16:02:27 +0000
+++ plugins/Unity/CMakeLists.txt 2014-08-25 13:04:52 +0000
@@ -1,3 +1,4 @@
1add_subdirectory(Connectivity)
1add_subdirectory(Indicators)2add_subdirectory(Indicators)
2add_subdirectory(Launcher)3add_subdirectory(Launcher)
3add_subdirectory(Session)4add_subdirectory(Session)
45
=== renamed directory 'plugins/Ubuntu/Connectivity' => 'plugins/Unity/Connectivity'
=== modified file 'plugins/Unity/Connectivity/CMakeLists.txt'
--- plugins/Ubuntu/Connectivity/CMakeLists.txt 2014-08-15 18:41:51 +0000
+++ plugins/Unity/Connectivity/CMakeLists.txt 2014-08-25 13:04:52 +0000
@@ -7,4 +7,4 @@
77
8qt5_use_modules(Connectivity Qml DBus Core)8qt5_use_modules(Connectivity Qml DBus Core)
99
10add_unity8_plugin(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS Connectivity)10add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
1111
=== modified file 'plugins/Unity/Connectivity/Connectivity.qmltypes'
--- plugins/Ubuntu/Connectivity/Connectivity.qmltypes 2014-08-15 18:41:51 +0000
+++ plugins/Unity/Connectivity/Connectivity.qmltypes 2014-08-25 13:04:52 +0000
@@ -4,13 +4,15 @@
4// It is used for QML tooling purposes only.4// It is used for QML tooling purposes only.
5//5//
6// This file was auto-generated by:6// This file was auto-generated by:
7// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'7// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 plugins'
88
9Module {9Module {
10 Component {10 Component {
11 name: "Connectivity"11 name: "Connectivity"
12 prototype: "QObject"12 prototype: "QObject"
13 exports: ["Ubuntu.Connectivity/Connectivity 0.1"]13 exports: ["Unity.Connectivity/Connectivity 0.1"]
14 isCreatable: false
15 isSingleton: true
14 exportMetaObjectRevisions: [0]16 exportMetaObjectRevisions: [0]
15 Method { name: "unlockAllModems" }17 Method { name: "unlockAllModems" }
16 }18 }
1719
=== modified file 'plugins/Unity/Connectivity/plugin.cpp'
--- plugins/Ubuntu/Connectivity/plugin.cpp 2014-08-15 18:41:51 +0000
+++ plugins/Unity/Connectivity/plugin.cpp 2014-08-25 13:04:52 +0000
@@ -28,7 +28,7 @@
2828
29void BackendPlugin::registerTypes(const char *uri)29void BackendPlugin::registerTypes(const char *uri)
30{30{
31 Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));31 Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
3232
33 qmlRegisterSingletonType<Connectivity>(uri, 0, 1, "Connectivity", service_provider);33 qmlRegisterSingletonType<Connectivity>(uri, 0, 1, "Connectivity", service_provider);
34}34}
3535
=== modified file 'plugins/Unity/Connectivity/qmldir'
--- plugins/Ubuntu/Connectivity/qmldir 2014-08-15 18:41:51 +0000
+++ plugins/Unity/Connectivity/qmldir 2014-08-25 13:04:52 +0000
@@ -1,3 +1,3 @@
1module Ubuntu.Connectivity1module Unity.Connectivity
2plugin Connectivity2plugin Connectivity
3typeinfo Connectivity.qmltypes3typeinfo Connectivity.qmltypes
44
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml 2014-08-22 09:28:47 +0000
+++ qml/Shell.qml 2014-08-25 13:04:52 +0000
@@ -20,9 +20,9 @@
20import Unity.Application 0.120import Unity.Application 0.1
21import Ubuntu.Components 0.121import Ubuntu.Components 0.1
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.0
23import Ubuntu.Connectivity 0.1
24import Ubuntu.Gestures 0.123import Ubuntu.Gestures 0.1
25import Ubuntu.SystemImage 0.124import Ubuntu.SystemImage 0.1
25import Unity.Connectivity 0.1
26import Unity.Launcher 0.126import Unity.Launcher 0.1
27import Utils 0.127import Utils 0.1
28import LightDM 0.1 as LightDM28import LightDM 0.1 as LightDM
@@ -421,9 +421,10 @@
421 }421 }
422 }422 }
423423
424 /* TODO re-enable when the corresponding changes in the service land (LP: #1361074)
424 Component.onCompleted: {425 Component.onCompleted: {
425 Connectivity.unlockAllModems()426 Connectivity.unlockAllModems()
426 }427 } */
427428
428 onUnlocked: greeter.hide()429 onUnlocked: greeter.hide()
429 onSelected: {430 onSelected: {
430431
=== modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
--- tests/mocks/Ubuntu/CMakeLists.txt 2014-08-15 18:41:51 +0000
+++ tests/mocks/Ubuntu/CMakeLists.txt 2014-08-25 13:04:52 +0000
@@ -1,4 +1,3 @@
1add_subdirectory(Connectivity)
2add_subdirectory(DownloadDaemonListener)1add_subdirectory(DownloadDaemonListener)
3add_subdirectory(Payments)2add_subdirectory(Payments)
4add_subdirectory(SystemImage)3add_subdirectory(SystemImage)
54
=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt 2014-08-07 15:29:12 +0000
+++ tests/mocks/Unity/CMakeLists.txt 2014-08-25 13:04:52 +0000
@@ -1,4 +1,5 @@
1add_subdirectory(Application)1add_subdirectory(Application)
2add_subdirectory(Connectivity)
2add_subdirectory(Indicators)3add_subdirectory(Indicators)
3add_subdirectory(Launcher)4add_subdirectory(Launcher)
4add_subdirectory(Notifications)5add_subdirectory(Notifications)
56
=== renamed directory 'tests/mocks/Ubuntu/Connectivity' => 'tests/mocks/Unity/Connectivity'
=== modified file 'tests/mocks/Unity/Connectivity/CMakeLists.txt'
--- tests/mocks/Ubuntu/Connectivity/CMakeLists.txt 2014-08-15 18:41:51 +0000
+++ tests/mocks/Unity/Connectivity/CMakeLists.txt 2014-08-25 13:04:52 +0000
@@ -7,4 +7,4 @@
77
8qt5_use_modules(MockConnectivity Qml Quick Core)8qt5_use_modules(MockConnectivity Qml Quick Core)
99
10add_unity8_mock(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS MockConnectivity)10add_unity8_mock(Unity.Connectivity 0.1 Unity/Connectivity TARGETS MockConnectivity)
1111
=== modified file 'tests/mocks/Unity/Connectivity/Connectivity.qmltypes'
--- tests/mocks/Ubuntu/Connectivity/Connectivity.qmltypes 2014-08-15 18:41:51 +0000
+++ tests/mocks/Unity/Connectivity/Connectivity.qmltypes 2014-08-25 13:04:52 +0000
@@ -4,13 +4,15 @@
4// It is used for QML tooling purposes only.4// It is used for QML tooling purposes only.
5//5//
6// This file was auto-generated by:6// This file was auto-generated by:
7// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'7// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 tests/mocks'
88
9Module {9Module {
10 Component {10 Component {
11 name: "MockConnectivity"11 name: "MockConnectivity"
12 prototype: "QObject"12 prototype: "QObject"
13 exports: ["Ubuntu.Connectivity/Connectivity 0.1"]13 exports: ["Unity.Connectivity/Connectivity 0.1"]
14 isCreatable: false
15 isSingleton: true
14 exportMetaObjectRevisions: [0]16 exportMetaObjectRevisions: [0]
15 Signal { name: "unlockingAllModems" }17 Signal { name: "unlockingAllModems" }
16 Method { name: "unlockAllModems" }18 Method { name: "unlockAllModems" }
1719
=== modified file 'tests/mocks/Unity/Connectivity/plugin.cpp'
--- tests/mocks/Ubuntu/Connectivity/plugin.cpp 2014-08-15 18:41:51 +0000
+++ tests/mocks/Unity/Connectivity/plugin.cpp 2014-08-25 13:04:52 +0000
@@ -28,7 +28,7 @@
2828
29void BackendPlugin::registerTypes(const char *uri)29void BackendPlugin::registerTypes(const char *uri)
30{30{
31 Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));31 Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
3232
33 qmlRegisterSingletonType<MockConnectivity>(uri, 0, 1, "Connectivity", service_provider);33 qmlRegisterSingletonType<MockConnectivity>(uri, 0, 1, "Connectivity", service_provider);
34}34}
3535
=== modified file 'tests/mocks/Unity/Connectivity/qmldir'
--- tests/mocks/Ubuntu/Connectivity/qmldir 2014-08-15 18:41:51 +0000
+++ tests/mocks/Unity/Connectivity/qmldir 2014-08-25 13:04:52 +0000
@@ -1,3 +1,3 @@
1module Ubuntu.Connectivity1module Unity.Connectivity
2plugin MockConnectivity2plugin MockConnectivity
3typeinfo Connectivity.qmltypes3typeinfo Connectivity.qmltypes
44
=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml 2014-08-21 14:46:12 +0000
+++ tests/qmltests/tst_Shell.qml 2014-08-25 13:04:52 +0000
@@ -21,8 +21,8 @@
21import QtTest 1.021import QtTest 1.0
22import GSettings 1.022import GSettings 1.0
23import LightDM 0.1 as LightDM23import LightDM 0.1 as LightDM
24import Ubuntu.Connectivity 0.1
25import Unity.Application 0.124import Unity.Application 0.1
25import Unity.Connectivity 0.1
26import Unity.Test 0.1 as UT26import Unity.Test 0.1 as UT
27import Powerd 0.127import Powerd 0.1
2828
@@ -460,6 +460,8 @@
460 unlockAllModemsSpy.clear()460 unlockAllModemsSpy.clear()
461 // actually create an object so we notice the onCompleted signal461 // actually create an object so we notice the onCompleted signal
462 var greeter = shellComponent.createObject(root)462 var greeter = shellComponent.createObject(root)
463 // TODO reenable when service ready (LP: #1361074)
464 expectFail("", "Unlock on boot temporarily disabled");
463 tryCompare(unlockAllModemsSpy, "count", 1)465 tryCompare(unlockAllModemsSpy, "count", 1)
464 greeter.destroy()466 greeter.destroy()
465 }467 }

Subscribers

People subscribed via source and target branches