Delete kglobalshortcutsrc before executing a test
Summary: When running the complete test suite the ScriptedEffectsTest::testShortcuts registers the shortcut meta+shift+y. But GlobalShortcutsTest::testX11ClientShortcut also tries to use this shortcut for a window shortcut which fails if it is already registered. So when running the complete test suite it depends on the order of execution whether the GlobalShortcutsTest passes or not. Test should be clean - also the globalshortcuts. As the config is read from test directory anyway, we can delete the file prior to init of kglobalaccel. Test Plan: Run ctest, test did not fail anymore Reviewers: #kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D16932
This commit is contained in:
parent
fa4f123fba
commit
260646ed62
1 changed files with 2 additions and 0 deletions
|
@ -48,6 +48,8 @@ WaylandTestApplication::WaylandTestApplication(OperationMode mode, int &argc, ch
|
|||
: Application(mode, argc, argv)
|
||||
{
|
||||
QStandardPaths::setTestModeEnabled(true);
|
||||
// TODO: add a test move to kglobalaccel instead?
|
||||
QFile{QStandardPaths::locate(QStandardPaths::ConfigLocation, QStringLiteral("kglobalshortcutsrc"))}.remove();
|
||||
QIcon::setThemeName(QStringLiteral("breeze"));
|
||||
#ifdef KWIN_BUILD_ACTIVITIES
|
||||
setUseKActivities(false);
|
||||
|
|
Loading…
Reference in a new issue