Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
efde2cbf
Commit
efde2cbf
authored
Sep 20, 2015
by
anonym
Browse files
Merge remote-tracking branch 'kytv/test/9653-optimize-irc-with-wait-any' into stable
Fix-committed:
#9653
parents
c21d3f40
99cb79e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
features/step_definitions/pidgin.rb
View file @
efde2cbf
...
...
@@ -288,8 +288,9 @@ end
Then
/^Pidgin successfully connects to the "([^"]+)" account$/
do
|
account
|
next
if
@skip_steps_while_restoring_background
expected_channel_entry
=
chan_image
(
account
,
default_chan
(
account
),
'roster'
)
reconnect_button
=
'PidginReconnect.png'
recovery_on_failure
=
Proc
.
new
do
@screen
.
wait_and_click
(
'PidginR
econnect
.png'
,
20
)
@screen
.
wait_and_click
(
r
econnect
_button
,
20
)
end
retry_tor
(
recovery_on_failure
)
do
begin
...
...
@@ -300,8 +301,10 @@ Then /^Pidgin successfully connects to the "([^"]+)" account$/ do |account|
# conversation window. At worst, the test will still fail...
close_pidgin_conversation_window
(
account
)
end
# FIXME This should be modified to use waitAny once #9633 is addressed
@screen
.
wait
(
expected_channel_entry
,
60
)
on_screen
,
_
=
@screen
.
waitAny
([
expected_channel_entry
,
reconnect_button
],
60
)
unless
on_screen
==
expected_channel_entry
raise
"Connecting to account
#{
account
}
failed."
end
end
end
...
...
anonym
@anonym
mentioned in issue
#9653 (closed)
·
May 14, 2020
mentioned in issue
#9653 (closed)
mentioned in issue #9653
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment