Unity

Merge lp:~unity-team/unity/phablet.rename-unity8 into lp:unity/phablet

  1. phablet.rename-unity8
  2. Merge into phablet
Proposed by Michał Sawicz
Status: Merged
Approved by: Sergio Schvezov
Approved revision: no longer in the source branch.
Merged at revision: 736
Proposed branch: lp:~unity-team/unity/phablet.rename-unity8
Merge into: lp:unity/phablet
Diff against target: 339 lines (+83/-53)
15 files modified
CMakeLists.txt (+4/-4)
build (+1/-1)
debian/changelog (+6/-0)
debian/control (+31/-7)
debian/unity8-autopilot.install (+1/-1)
debian/unity8-fake-env.install (+1/-1)
debian/unity8.install (+19/-19)
run (+1/-1)
run_on_device (+2/-2)
runtests.sh (+1/-1)
tests/autopilot/unity8/__init__.py (+1/-1)
tests/autopilot/unity8/tests/__init__.py (+8/-8)
tests/autopilot/unity8/tests/testbigscreen.py (+1/-1)
tests/autopilot/unity8/tests/testcases.py (+2/-2)
unity8.desktop.in (+4/-4)
To merge this branch: bzr merge lp:~unity-team/unity/phablet.rename-unity8
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli packaging Pending
Review via email: mp+167268@code.launchpad.net

Commit message

rename qml-phone-shell to unity8

Description of the change

Since the decision was made for the QML shell to be just "Unity 8", let's rename it!

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

I'm tracking down other places where we need to do a rename. Please don't top-approve until then.

Revision history for this message
Michał Sawicz (saviq) wrote :

Related MRs:

lp:~saviq/session-manager/rename-unity8
lp:~saviq/touch-preview-images/rename-unity8

Revision history for this message
Michael Zanetti (mzanetti) wrote :

Not sure it is a good idea to name the binary unity8. Renaming the binary on ever major release seems useless additional work to me.

I'm also not a big fan of the package having the 8 in the name, but that seems to be common practice so I would be ok with that.

Bad thing is, I don't have a better idea as we obviously can't conflict with current unity. Maybe something like unity-convergence? Sucks too in some ways...

Anyways, I think it might make sense to think a bit more about the binary name...

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

FAILED: Continuous integration, rev:732
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1144/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/10
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1854/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1144/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

W dniu 04.06.2013 16:09, Michael Zanetti pisze:
> Not sure it is a good idea to name the binary unity8. Renaming the binary on ever major release seems useless additional work to me.
>
> I'm also not a big fan of the package having the 8 in the name, but that seems to be common practice so I would be ok with that.

This is all just a temporary solution, only there to make sure that we
can install both Unity v7 and Unity v8 in parallel. As soon as Unity v8
becomes the default, the package and binary will be renamed to just
"unity" with version 8.

> Bad thing is, I don't have a better idea as we obviously can't conflict with current unity. Maybe something like unity-convergence? Sucks too in some ways...
>
> Anyways, I think it might make sense to think a bit more about the binary name...

I don't think there's value in finding yet another temporary name. And
the decision has been made that this is Unity v8, so why not name it thus?
--
Michał Sawicz <email address hidden>
Canonical Services Ltd.

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

> Related MRs:
>
> lp:~saviq/session-manager/rename-unity8
> lp:~saviq/touch-preview-images/rename-unity8

Not here, this is for raring... I'll create a new config that handles this name change

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

http://bazaar.launchpad.net/~cupstream2distro-maintainers/cupstream2distro-config/trunk/view/head:/stacks/phablet/shell.cfg#L31

and lp:phablet-tools

I'll take care of these

Revision history for this message
Michał Sawicz (saviq) wrote :

Just a follow-up - we decided that unity8, although not a great name for a binary, will make sure no other name "sticks" to the new Unity - which is just a new version - version 8.

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

FAILED: Continuous integration, rev:732
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1154/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/20
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1899/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1154/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:732
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1157/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/23
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1902/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1157/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:733
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1159/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1904

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1159/rebuild

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

FAILED: Continuous integration, rev:733
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1159/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1904

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1159/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:734
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1161/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1907

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1161/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

Good, works; will need some more extensive testing, but approving for now to get more people in to it

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-06-04 08:58:32 +0000
+++ CMakeLists.txt 2013-06-05 16:32:28 +0000
@@ -5,7 +5,7 @@
5 set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "" FORCE)5 set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "" FORCE)
6endif()6endif()
77
8project(qml-phone-shell C CXX)8project(unity8 C CXX)
99
10if(${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})10if(${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
11 message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")11 message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")
@@ -56,7 +56,7 @@
56# Standard install paths56# Standard install paths
57include(GNUInstallDirs)57include(GNUInstallDirs)
5858
59set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/qml-phone-shell)59set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
6060
61configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)61configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
6262
@@ -90,11 +90,11 @@
9090
91# Autopilot tests91# Autopilot tests
92include(autopilot)92include(autopilot)
93declare_autopilot_test(qml_phone_shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)93declare_autopilot_test(unity8 ${CMAKE_SOURCE_DIR}/tests/autopilot/)
9494
95add_subdirectory(tests)95add_subdirectory(tests)
9696
97set(SHELL_APP qml-phone-shell)97set(SHELL_APP unity8)
9898
99set(shell_app_HDRS99set(shell_app_HDRS
100 )100 )
101101
=== modified file 'build'
--- build 2013-06-05 12:54:44 +0000
+++ build 2013-06-05 16:32:28 +0000
@@ -1,6 +1,6 @@
1#!/bin/sh1#!/bin/sh
22
3PACKAGE=qml-phone-shell3PACKAGE=unity8
4UNITY_BUILD_DIR=$PWD/../unity_build/build4UNITY_BUILD_DIR=$PWD/../unity_build/build
5SETUP=false5SETUP=false
6CLEAN=false6CLEAN=false
77
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-31 22:31:27 +0000
+++ debian/changelog 2013-06-05 16:32:28 +0000
@@ -1,3 +1,9 @@
1unity8 (7.80.0) saucy; urgency=low
2
3 * Rename to unity8.
4
5 -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 04 Jun 2013 14:45:29 +0200
6
1qml-phone-shell (1.80) raring; urgency=low7qml-phone-shell (1.80) raring; urgency=low
28
3 * Focus/unfocus apps on lock/unlock to make sure keyboard is hidden.9 * Focus/unfocus apps on lock/unlock to make sure keyboard is hidden.
410
=== modified file 'debian/control'
--- debian/control 2013-06-04 08:58:32 +0000
+++ debian/control 2013-06-05 16:32:28 +0000
@@ -1,4 +1,4 @@
1Source: qml-phone-shell1Source: unity8
2Section: x112Section: x11
3Priority: extra3Priority: extra
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
@@ -33,7 +33,9 @@
33Vcs-Bzr: https://code.launchpad.net/~unity-team/unity/phablet33Vcs-Bzr: https://code.launchpad.net/~unity-team/unity/phablet
34Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity/phablet/files34Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity/phablet/files
3535
36Package: qml-phone-shell36Package: unity8
37Replaces: qml-phone-shell (<< 7.80~)
38Breaks: qml-phone-shell (<< 7.80~)
37Architecture: amd64 armhf i38639Architecture: amd64 armhf i386
38Depends: indicators-client (>= 0.6.1),40Depends: indicators-client (>= 0.6.1),
39 qtdeclarative5-dee-plugin,41 qtdeclarative5-dee-plugin,
@@ -50,22 +52,44 @@
50Description: Ubuntu QML shell52Description: Ubuntu QML shell
51 The Ubuntu QML shell is the primary user interface for Ubuntu devices.53 The Ubuntu QML shell is the primary user interface for Ubuntu devices.
5254
53Package: qml-phone-shell-fake-env55Package: qml-phone-shell
56Depends: unity8, ${misc:Depends}
57Architecture: all
58Description: transitional dummy package
59 This is a transitional dummy package. It can safely be removed.
60
61Package: unity8-fake-env
62Replaces: qml-phone-shell-fake-env (<< 7.80~)
63Breaks: qml-phone-shell-fake-env (<< 7.80~)
54Architecture: amd64 armhf i38664Architecture: amd64 armhf i386
55Depends: ${misc:Depends}, ${shlibs:Depends}65Depends: ${misc:Depends}, ${shlibs:Depends}
56Description: Fake environment for running Ubuntu QML shell66Description: Fake environment for running Ubuntu QML shell
57 Provides fake implementations of some QML modules used by Ubuntu QML shell67 Provides fake implementations of some QML modules used by Ubuntu QML shell
58 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.68 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
5969
60Package: qml-phone-shell-autopilot70Package: qml-phone-shell-fake-env
71Depends: unity8-fake-env, ${misc:Depends}
72Architecture: all
73Description: transitional dummy package
74 This is a transitional dummy package. It can safely be removed.
75
76Package: unity8-autopilot
77Replaces: qml-phone-shell-autopilot (<< 7.80~)
78Breaks: qml-phone-shell-autopilot (<< 7.80~)
61Architecture: all79Architecture: all
62Depends: libautopilot-qt,80Depends: libautopilot-qt,
63 libqt5test5,81 libqt5test5,
64 libqt5widgets5,82 libqt5widgets5,
65 python-evdev,83 python-evdev,
66 qml-phone-shell (= ${source:Version}),84 unity8 (= ${source:Version}),
67 qml-phone-shell-fake-env (= ${source:Version}),85 unity8-fake-env (= ${source:Version}),
68 ${misc:Depends},86 ${misc:Depends},
69 ${shlibs:Depends},87 ${shlibs:Depends},
70Description: Test package for the shell88Description: Test package for the shell
71 Autopilot tests for the qml-phone-shell package89 Autopilot tests for the unity8 package
90
91Package: qml-phone-shell-autopilot
92Depends: unity8-autopilot, ${misc:Depends}
93Architecture: all
94Description: transitional dummy package
95 This is a transitional dummy package. It can safely be removed.
7296
=== renamed file 'debian/qml-phone-shell-autopilot.install' => 'debian/unity8-autopilot.install'
--- debian/qml-phone-shell-autopilot.install 2013-04-19 13:37:04 +0000
+++ debian/unity8-autopilot.install 2013-06-05 16:32:28 +0000
@@ -1,1 +1,1 @@
1tests/autopilot/qml_phone_shell/* usr/lib/python2.7/dist-packages/qml_phone_shell/1tests/autopilot/unity8/* usr/lib/python2.7/dist-packages/unity8/
22
=== renamed file 'debian/qml-phone-shell-fake-env.install' => 'debian/unity8-fake-env.install'
--- debian/qml-phone-shell-fake-env.install 2013-04-18 18:01:03 +0000
+++ debian/unity8-fake-env.install 2013-06-05 16:32:28 +0000
@@ -1,1 +1,1 @@
1/usr/share/qml-phone-shell/plugins/mocks/*1/usr/share/unity8/plugins/mocks/*
22
=== renamed file 'debian/qml-phone-shell.install' => 'debian/unity8.install'
--- debian/qml-phone-shell.install 2013-05-27 07:00:02 +0000
+++ debian/unity8.install 2013-06-05 16:32:28 +0000
@@ -1,20 +1,20 @@
1/usr/bin/qml-phone-shell1/usr/bin/unity8
2/usr/share/applications/qml-phone-shell.desktop2/usr/share/applications/unity8.desktop
3/usr/share/locale/*3/usr/share/locale/*
4/usr/share/qml-phone-shell/Applications/*4/usr/share/unity8/Applications/*
5/usr/share/qml-phone-shell/Bottombar/*5/usr/share/unity8/Bottombar/*
6/usr/share/qml-phone-shell/Components/*6/usr/share/unity8/Components/*
7/usr/share/qml-phone-shell/Dash/*7/usr/share/unity8/Dash/*
8/usr/share/qml-phone-shell/Greeter/*8/usr/share/unity8/Greeter/*
9/usr/share/qml-phone-shell/Hud/*9/usr/share/unity8/Hud/*
10/usr/share/qml-phone-shell/Launcher/*10/usr/share/unity8/Launcher/*
11/usr/share/qml-phone-shell/Notifications/*11/usr/share/unity8/Notifications/*
12/usr/share/qml-phone-shell/Panel/*12/usr/share/unity8/Panel/*
13/usr/share/qml-phone-shell/Shell.qml13/usr/share/unity8/Shell.qml
14/usr/share/qml-phone-shell/SideStage/*14/usr/share/unity8/SideStage/*
15/usr/share/qml-phone-shell/graphics/*15/usr/share/unity8/graphics/*
16/usr/share/qml-phone-shell/plugins/HudClient/*16/usr/share/unity8/plugins/HudClient/*
17/usr/share/qml-phone-shell/plugins/LightDM/*17/usr/share/unity8/plugins/LightDM/*
18/usr/share/qml-phone-shell/plugins/Ubuntu/*18/usr/share/unity8/plugins/Ubuntu/*
19/usr/share/qml-phone-shell/plugins/Unity/*19/usr/share/unity8/plugins/Unity/*
20/usr/share/qml-phone-shell/plugins/Utils/*20/usr/share/unity8/plugins/Utils/*
2121
=== modified file 'run'
--- run 2013-06-03 15:33:42 +0000
+++ run 2013-06-05 16:32:28 +0000
@@ -1,6 +1,6 @@
1#!/bin/sh1#!/bin/sh
22
3QML_PHONE_SHELL_PATH=./builddir/qml-phone-shell3QML_PHONE_SHELL_PATH=./builddir/unity8
4export LD_LIBRARY_PATH=$PWD/../unity_build/build/lib4export LD_LIBRARY_PATH=$PWD/../unity_build/build/lib
5GDB=false5GDB=false
6FAKE=false6FAKE=false
77
=== modified file 'run_on_device'
--- run_on_device 2013-05-29 08:21:31 +0000
+++ run_on_device 2013-06-05 16:32:28 +0000
@@ -3,8 +3,8 @@
3USER=phablet3USER=phablet
4USER_ID=320114USER_ID=32011
5PASSWORD=phablet5PASSWORD=phablet
6PACKAGE=qml-phone-shell6PACKAGE=unity8
7BINARY=qml-phone-shell7BINARY=unity8
8TARGET_IP=${TARGET_IP-127.0.0.1}8TARGET_IP=${TARGET_IP-127.0.0.1}
9TARGET_SSH_PORT=${TARGET_SSH_PORT-2222}9TARGET_SSH_PORT=${TARGET_SSH_PORT-2222}
10TARGET_DEBUG_PORT=376810TARGET_DEBUG_PORT=3768
1111
=== modified file 'runtests.sh'
--- runtests.sh 2013-04-23 19:50:21 +0000
+++ runtests.sh 2013-06-05 16:32:28 +0000
@@ -105,7 +105,7 @@
105echo " <source>`pwd`</source>" >> $coveragefile105echo " <source>`pwd`</source>" >> $coveragefile
106echo " </sources>" >> $coveragefile106echo " </sources>" >> $coveragefile
107echo " <packages>" >> $coveragefile107echo " <packages>" >> $coveragefile
108echo " <package branch-rate=\"0.0\" complexity=\"0.0\" line-rate=\"$linespercentagef\" name=\"qml-phone-shell\">" >> $coveragefile108echo " <package branch-rate=\"0.0\" complexity=\"0.0\" line-rate=\"$linespercentagef\" name=\"unity8\">" >> $coveragefile
109echo " <classes>" >> $coveragefile109echo " <classes>" >> $coveragefile
110110
111for i in $file_list; do111for i in $file_list; do
112112
=== renamed directory 'tests/autopilot/qml_phone_shell' => 'tests/autopilot/unity8'
=== modified file 'tests/autopilot/unity8/__init__.py'
--- tests/autopilot/qml_phone_shell/__init__.py 2013-02-26 15:45:50 +0000
+++ tests/autopilot/unity8/__init__.py 2013-06-05 16:32:28 +0000
@@ -5,4 +5,4 @@
5# under the terms of the GNU General Public License version 3, as published5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.6# by the Free Software Foundation.
77
8"""qml-phone-shell autopilot tests and emulators - top level package."""8"""unity8 autopilot tests and emulators - top level package."""
99
=== modified file 'tests/autopilot/unity8/tests/__init__.py'
--- tests/autopilot/qml_phone_shell/tests/__init__.py 2013-06-03 15:32:21 +0000
+++ tests/autopilot/unity8/tests/__init__.py 2013-06-05 16:32:28 +0000
@@ -5,7 +5,7 @@
5# under the terms of the GNU General Public License version 3, as published5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.6# by the Free Software Foundation.
77
8"""qml-phone-shell autopilot tests."""8"""unity8 autopilot tests."""
99
10import os.path10import os.path
1111
@@ -14,7 +14,7 @@
14from autopilot.platform import model14from autopilot.platform import model
15from testtools.matchers import Equals15from testtools.matchers import Equals
1616
17from qml_phone_shell.emulators.main_window import MainWindow17from unity8.emulators.main_window import MainWindow
1818
19class FormFactors(object):19class FormFactors(object):
20 Phone, Tablet, Desktop = range(3)20 Phone, Tablet, Desktop = range(3)
@@ -43,20 +43,20 @@
43 os.environ['QML2_IMPORT_PATH'] = "../../builddir/tests/mocks:../../builddir/plugins"43 os.environ['QML2_IMPORT_PATH'] = "../../builddir/tests/mocks:../../builddir/plugins"
44 if geometry != "0x0":44 if geometry != "0x0":
45 self.app = self.launch_test_application(45 self.app = self.launch_test_application(
46 "../../builddir/qml-phone-shell", "-geometry", geometry, "-frameless", app_type='qt')46 "../../builddir/unity8", "-geometry", geometry, "-frameless", app_type='qt')
47 else:47 else:
48 self.app = self.launch_test_application(48 self.app = self.launch_test_application(
49 "../../builddir/qml-phone-shell", "-fullscreen", app_type='qt')49 "../../builddir/unity8", "-fullscreen", app_type='qt')
5050
51 def launch_test_installed(self, geometry):51 def launch_test_installed(self, geometry):
52 os.environ['LD_LIBRARY_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks/LightDM/" + self.lightdm_mock52 os.environ['LD_LIBRARY_PATH'] = "/usr/share/unity8/plugins/mocks/LightDM/" + self.lightdm_mock
53 os.environ['QML2_IMPORT_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks:/usr/share/qml-phone-shell/plugins"53 os.environ['QML2_IMPORT_PATH'] = "/usr/share/unity8/plugins/mocks:/usr/share/unity8/plugins"
54 if model() == 'Desktop' and geometry != "0x0":54 if model() == 'Desktop' and geometry != "0x0":
55 self.app = self.launch_test_application(55 self.app = self.launch_test_application(
56 "qml-phone-shell", "-geometry", geometry, "-frameless", app_type='qt')56 "unity8", "-geometry", geometry, "-frameless", app_type='qt')
57 else:57 else:
58 self.app = self.launch_test_application(58 self.app = self.launch_test_application(
59 "qml-phone-shell", "-fullscreen", app_type='qt')59 "unity8", "-fullscreen", app_type='qt')
6060
61 def skipWrapper(*args, **kwargs):61 def skipWrapper(*args, **kwargs):
62 pass62 pass
6363
=== modified file 'tests/autopilot/unity8/tests/testbigscreen.py'
--- tests/autopilot/qml_phone_shell/tests/testbigscreen.py 2013-03-05 12:57:00 +0000
+++ tests/autopilot/unity8/tests/testbigscreen.py 2013-06-05 16:32:28 +0000
@@ -10,7 +10,7 @@
10from testtools.matchers import Equals10from testtools.matchers import Equals
11from autopilot.matchers import Eventually11from autopilot.matchers import Eventually
1212
13from qml_phone_shell.tests import ShellTestCase13from unity8.tests import ShellTestCase
1414
15class TestBig(ShellTestCase):15class TestBig(ShellTestCase):
16 def setUp(self):16 def setUp(self):
1717
=== modified file 'tests/autopilot/unity8/tests/testcases.py'
--- tests/autopilot/qml_phone_shell/tests/testcases.py 2013-05-29 16:22:49 +0000
+++ tests/autopilot/unity8/tests/testcases.py 2013-06-05 16:32:28 +0000
@@ -25,8 +25,8 @@
2525
26from __future__ import absolute_import26from __future__ import absolute_import
2727
28from qml_phone_shell.tests import ShellTestCase, FormFactors28from unity8.tests import ShellTestCase, FormFactors
29from qml_phone_shell.tests.helpers import TestShellHelpers29from unity8.tests.helpers import TestShellHelpers
3030
31from autopilot.input import Mouse, Touch, Pointer31from autopilot.input import Mouse, Touch, Pointer
32from testtools.matchers import Equals, NotEquals, GreaterThan, MismatchError32from testtools.matchers import Equals, NotEquals, GreaterThan, MismatchError
3333
=== renamed file 'qml-phone-shell.desktop.in' => 'unity8.desktop.in'
--- qml-phone-shell.desktop.in 2013-04-04 08:39:35 +0000
+++ unity8.desktop.in 2013-06-05 16:32:28 +0000
@@ -1,10 +1,10 @@
1[Desktop Entry]1[Desktop Entry]
2Type=Application2Type=Application
3Name=Unity Next3Name=Unity 8
4GenericName=qml-phone-shell4GenericName=unity8
5Comment=The converged Unity shell5Comment=The converged Unity shell
6Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/qml-phone-shell6Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8
7Terminal=false7Terminal=false
8Icon=qml-phone-shell8Icon=unity8
9NoDisplay=true9NoDisplay=true
10X-Ubuntu-Touch=true10X-Ubuntu-Touch=true
1111
=== renamed file 'unity.qmlproject' => 'unity8.qmlproject'

Subscribers

People subscribed via source and target branches

to all changes: