git.iko.soy/unity8
on xenial help sign in
More fixes, rename unity8-fake-env to unity8-tests
commitd4ccfbd77a1dba1ec1f45756eef5bd1f0c83c029 authorMichael Terry <michael.terry@canonical.com> dateFri 22 Apr 2016, 16:01 (11 years ago) parentc1acb7d
5 files changed+14−10
compare with xenial
unifiedsplit
debian/control+10−6 debian/unity8-fake-env.install → debian/unity8-tests.install tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+1−1 tests/plugins/Unity/Launcher/CMakeLists.txt+2−2 tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−1
debian/control+10−6
@@ -137,7 +137,7 @@ Depends: qml-module-qtquick-layouts,
137137 unity-notifications-impl-3,
138138 unity-plugin-scopes | unity-scopes-impl,
139139 unity-scopes-impl-11,
140− unity8-fake-env | unity-application-impl,
140+ unity8-tests | unity-application-impl,
141141 ${misc:Depends},
142142Breaks: unity8 (<< 7.86),
143143Replaces: unity8 (<< 7.86),
@@ -163,7 +163,7 @@ Depends: autopilot-qt5 (>= 1.4),
163163 ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
164164 unity-scope-click,
165165 unity8 (= ${source:Version}),
166− unity8-fake-env (= ${source:Version}),
166+ unity8-tests (= ${source:Version}),
167167 url-dispatcher-tools,
168168 xvfb,
169169 ${misc:Depends},
@@ -171,7 +171,7 @@ Depends: autopilot-qt5 (>= 1.4),
171171Description: Test package for Unity 8 shell
172172 Autopilot tests for the unity8 package
173173
174−Package: unity8-fake-env
174+Package: unity8-tests
175175Architecture: any
176176Multi-Arch: same
177177Pre-Depends: ${misc:Pre-Depends},
@@ -181,10 +181,14 @@ Depends: dbus-test-runner,
181181 ${shlibs:Depends},
182182Provides: unity-application-impl,
183183 unity-application-impl-14,
184−Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
185−Description: Fake environment for running Unity 8 shell
184+ unity8-fake-env,
185+Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),
186+ unity8-fake-env,
187+Conflicts: unity8-fake-env,
188+Description: Scripts and mocks for running Unity 8 shell tests
186189 Provides fake implementations of some QML modules used by Unity 8 shell
187− (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
190+ (e.g Ubuntu.Application) so that you can run it in a sandboxed environment
191+ and scripts to run its test suite.
188192
189193Package: unity8-private
190194Architecture: any
debian/unity8-fake-env.install → debian/unity8-tests.installrenamed

The content is the same.

tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+1−1
@@ -47,7 +47,7 @@ private Q_SLOTS:
4747
4848 void init() {
4949 // Launcher will look in current dir in testing mode for data
50− QDir::setCurrent(testLibDir() + "/" + TEST_DIR);
50+ QDir::setCurrent(testDataDir() + "/" TEST_DIR);
5151
5252 // Prepare some fake list
5353 QList<QVariantMap> list;
tests/plugins/Unity/Launcher/CMakeLists.txt+2−2
@@ -60,7 +60,7 @@ foreach(DESKTOP_FILE ${DESKTOP_FILES})
6060 )
6161endforeach()
6262install(FILES ${DESKTOP_FILES}
63− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
63+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/Unity/Launcher"
6464 )
6565
6666# copy .svg files into build directory for shadow builds
@@ -72,5 +72,5 @@ foreach(DESKTOP_FILE ${DESKTOP_FILES})
7272 )
7373endforeach()
7474install(FILES ${DESKTOP_FILES}
75− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
75+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/Unity/Launcher"
7676 )
tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−1
@@ -166,7 +166,7 @@ private Q_SLOTS:
166166 // Adding 2 apps to the mock appmanager. Both should appear in the launcher.
167167 void init() {
168168 // Launcher will look in current dir in testing mode for data
169− QDir::setCurrent(testLibDir() + "/" + TEST_DIR);
169+ QDir::setCurrent(testDataDir() + "/" TEST_DIR);
170170
171171 QDBusInterface accountsInterface(QStringLiteral("org.freedesktop.Accounts"),
172172 QStringLiteral("/org/freedesktop/Accounts"),