[Qa-jenkins-scm] [jenkins.debian.net] 01/01: lvc: deal with Scan CD/DVD prompt

[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 b0ab078f78601766f0a977c901593c31e58cb5c0
Author: Philip Hands <phil at hands.com>
Date:   Wed Jan 25 22:31:14 2017 +0100

    lvc: deal with Scan CD/DVD prompt
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cucumber/features/images/d-i_gui_ScanCD.png        | Bin 1779 -> 12520 bytes
 cucumber/features/step_definitions/common_steps.rb |   5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cucumber/features/images/d-i_gui_ScanCD.png b/cucumber/features/images/d-i_gui_ScanCD.png
index 43ff764..93fea2b 100644
Binary files a/cucumber/features/images/d-i_gui_ScanCD.png and b/cucumber/features/images/d-i_gui_ScanCD.png differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index cbedbe9..328c566 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -397,7 +397,7 @@ Given /^I note that the Base system is being installed$/ do
 end
 
 Given /^I accept the default mirror$/ do
-  on_screen, _ = @screen.waitAny([diui_png("popcon"),diui_png("BadMirror"),diui_png("MirrorCountry")], 10 * 60 * PATIENCE)
+  on_screen, _ = @screen.waitAny([diui_png("popcon"),diui_png("BadMirror"),diui_png("MirrorCountry"),diui_png("ScanCD")], 10 * 60 * PATIENCE)
   if diui_png("MirrorCountry") == on_screen
     @screen.wait(diui_png("MirrorCountry"), 10 * 60 * PATIENCE)
     @screen.type(Sikuli::Key.ENTER)
@@ -406,6 +406,9 @@ Given /^I accept the default mirror$/ do
     @screen.wait(diui_png("HttpProxy"), 5 * PATIENCE)
     @screen.type("http://local-http-proxy:3128/" + Sikuli::Key.ENTER)
     #@screen.type(Sikuli::Key.ENTER)
+  elsif diui_png("ScanCD") == on_screen
+    @screen.type(Sikuli::Key.ENTER)
+    step("I accept the default mirror")
   else
     step("I ignore Popcon")
   end

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