git.iko.soy/unity8
on xenial help sign in
Fix some review issues
6ee8d3cMichael Terry
tests/mocks/Powerd/Powerd.h+1−2
compare with xenial
unifiedsplit
@@ -13,8 +13,7 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
15 *
16− * Authors: Gerry Boland <gerry.boland@canonical.com>
17− * Michael Terry <michael.terry@canonical.com>
16+ * Authors: Michael Terry <michael.terry@canonical.com>
18 */
17 */
19
18
20#ifndef UNITY_MOCK_POWERD_H
19#ifndef UNITY_MOCK_POWERD_H
tests/mocks/Powerd/plugin.cpp+1−2
@@ -13,8 +13,7 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
15 *
16− * Authors: Gerry Boland <gerry.boland@canonical.com>
17− * Michael Terry <michael.terry@canonical.com>
16+ * Authors: Michael Terry <michael.terry@canonical.com>
18 */
17 */
19
18
20#include "plugin.h"
19#include "plugin.h"
tests/mocks/Powerd/plugin.h+1−2
@@ -13,8 +13,7 @@
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
15 *
16− * Authors: Gerry Boland <gerry.boland@canonical.com>
17− * Michael Terry <michael.terry@canonical.com>
16+ * Authors: Michael Terry <michael.terry@canonical.com>
18 */
17 */
19
18
20#ifndef MOCK_POWER_PLUGIN_H
19#ifndef MOCK_POWER_PLUGIN_H
tests/mocks/Powerd/qmldir−1
@@ -1,3 +1,2 @@
1module Powerd
1module Powerd
2plugin MockPowerd-qml
2plugin MockPowerd-qml
3−typeinfo plugin.qmltypes
tests/qmltests/tst_Shell.qml+2−1
@@ -60,8 +60,9 @@ Item {
60 function cleanup() {
60 function cleanup() {
61 // If a test invoked the greeter, make sure we swipe it away again
61 // If a test invoked the greeter, make sure we swipe it away again
62 var greeter = findChild(shell, "greeter");
62 var greeter = findChild(shell, "greeter");
63− if (greeter.shown)
63+ if (greeter.shown) {
64 swipeAwayGreeter();
64 swipeAwayGreeter();
65+ }
65
66
66 // kill all (fake) running apps
67 // kill all (fake) running apps
67 killApps(ApplicationManager.mainStageApplications);
68 killApps(ApplicationManager.mainStageApplications);