Skip to content

Commit

Permalink
Revert "kontact: Use more stable user-console for shell commands"
Browse files Browse the repository at this point in the history
This reverts commit 0840318.

Setting DISPLAY=:0 is not a reliable method to get access to the X
server and session DBus.
  • Loading branch information
Vogtinator committed Mar 22, 2019
1 parent a414516 commit b77b1b5
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions tests/x11/kontact.pm
@@ -1,7 +1,7 @@
# SUSE's openQA tests
#
# Copyright © 2009-2013 Bernhard M. Wiedemann
# Copyright © 2012-2019 SUSE LLC
# Copyright © 2012-2017 SUSE LLC
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
Expand All @@ -18,17 +18,16 @@ use testapi;
use version_utils 'is_pre_15';

sub run {
select_console 'user-console';
# start akonadi server to avoid the self-test running when we launch kontact
assert_script_run 'DISPLAY=:0 akonadictl start >& /dev/null';
x11_start_program('akonadictl start', valid => 0);

# Workaround: sometimes the account assistant behind of mainwindow or tips window
# To disable it run at first time start
if (is_pre_15) {
assert_script_run 'echo -e "[General]\nfirst-start=false" >> ~/.kde4/share/config/kmail2rc';
x11_start_program('echo -e "[General]\nfirst-start=false" >> ~/.kde4/share/config/kmail2rc', valid => 0);
}
assert_script_run 'echo -e "[General]\nfirst-start=false" >> ~/.config/kmail2rc';
select_console 'x11';
x11_start_program('echo -e "[General]\nfirst-start=false" >> ~/.config/kmail2rc', valid => 0);

my @tags = qw(test-kontact-1 kontact-import-data-dialog kontact-window);
x11_start_program('kontact', target_match => \@tags);
do {
Expand Down

0 comments on commit b77b1b5

Please sign in to comment.