[Qa-jenkins-scm] [jenkins.debian.net] 01/07: lvc: duplicate the waitAny to deal with race condition

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 4cedc6058bb274a582477c295117f0826e9fd9c3
Author: Philip Hands <phil at hands.com>
Date:   Thu May 26 23:52:59 2016 +0200

    lvc: duplicate the waitAny to deal with race condition
---
 cucumber/features/step_definitions/common_steps.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 6894b83..c45459d 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -306,6 +306,7 @@ end
 Given /^in ([a-z]*) mode I set the root password to "([^"]*)"$/ do |ui_mode, rootpw|
 # Root Password, twice
   on_screen, _ = @screen.waitAny([diui_png("ShowRootPassword",ui_mode),diui_png("RootPassword",ui_mode)], 30 * PATIENCE)
+  on_screen, _ = @screen.waitAny([diui_png("ShowRootPassword",ui_mode),diui_png("RootPassword",ui_mode)], 30 * PATIENCE)
   @screen.type(rootpw)
   if "gui" == ui_mode
     @screen.type(Sikuli::Key.TAB)
@@ -324,6 +325,7 @@ Given /^in ([a-z]*) mode I set the password for "([^"]*)" to be "([^"]*)"$/ do |
   @screen.waitVanish(diui_png("NameOfUser",ui_mode), 10 * PATIENCE)
   @screen.type(Sikuli::Key.ENTER)
   on_screen, _ = @screen.waitAny([diui_png("ShowUserPassword",ui_mode),diui_png("UserPassword",ui_mode)], 10 * PATIENCE)
+  on_screen, _ = @screen.waitAny([diui_png("ShowUserPassword",ui_mode),diui_png("UserPassword",ui_mode)], 10 * PATIENCE)
   @screen.type(password)
   if "gui" == ui_mode
     @screen.type(Sikuli::Key.TAB)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git