Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix multi-user.target isolation in multi_user_dm #4838

Merged
merged 1 commit into from
Apr 13, 2018
Merged

Fix multi-user.target isolation in multi_user_dm #4838

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tests/x11/multi_users_dm.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ use utils;

sub ensure_multi_user_target {
type_string "systemctl isolate multi-user.target\n";
wait_still_screen 5;
send_key "ctrl-alt-f" . get_root_console_tty;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's at least wrap it in wait_screen_change, because we can send alt-c too early.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait_screen_change doesn't seem to be triggered in this case:
http://artemis.suse.de/tests/166

+    wait_screen_change {
+        type_string "systemctl isolate multi-user.target\n";
+        send_key "ctrl-alt-f" . get_root_console_tty;
+    }

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually meant wrapping send_key. In case we type text it doesn't make sense as screen changes after first symbol. Could you please try with just send_key?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the commit and tested: http://artemis.suse.de/tests/167

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, now we get exact glitches I got while working on this issue. I also tried to restart X by restarting services, it didn't help. So I guess we should consider rebooting in the test as there is no progress on the bug...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sorry for this confusion, but I meant send key on L#25 mainly, so we switch to tty before sending ctrl-c. But wrapped ctrl-c also doesn't hurt.

wait_screen_change {
send_key "ctrl-c";
}
reset_consoles;
wait_still_screen 10;
# isolating multi-user.target logs us out
Expand Down