summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cucumber/features/install.feature1
-rw-r--r--cucumber/features/step_definitions/common_steps.rb6
2 files changed, 3 insertions, 4 deletions
diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature
index cea2a63c..5ffdb78b 100644
--- a/cucumber/features/install.feature
+++ b/cucumber/features/install.feature
@@ -100,7 +100,6 @@ Feature: Doing variations on d-i installs
And I note that the Base system is being installed
And I wait patiently for the package installation to start
And I wait while the bulk of the packages are installed
- And I install GRUB
And I allow reboot after the install is complete
And I wait for the reboot
And I power off the computer
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 16caf653..73511666 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -573,12 +573,12 @@ Given /^I wait while the bulk of the packages are installed$/ do
@screen.wait(diui_png("InstallSoftware"), 10)
debug_log("debug: we see InstallSoftware", :color => :blue)
failed = false
- try_for(180*60, :msg => "it seems that the install stalled (timing-out after 2 hours)") do
+ try_for(180*60, :msg => "it seems that the install stalled (timing-out after 3 hours)") do
found = false
sleep(30)
debug_log("debug: check for Install GRUB/Software", :color => :blue)
if $vm.is_running?
- hit, _ = @screen.waitAny([diui_png("InstallGRUB"),diui_png("InstallGRUB-heading"),diui_png("InstallationStepFailed"),diui_png("InstallSoftware")], 10)
+ hit, _ = @screen.waitAny([diui_png("InstallGRUB"),diui_png("InstallGRUB-heading"),diui_png("InstallComplete"),diui_png("InstallationStepFailed"),diui_png("InstallSoftware")], 10)
else
found = true
hit = ''
@@ -607,7 +607,7 @@ Given /^I wait while the bulk of the packages are installed$/ do
debug_log("debug: pressed F1", :color => :blue)
sleep(20)
end
- when diui_png("InstallGRUB"), diui_png("InstallGRUB-heading")
+ when diui_png("InstallGRUB"), diui_png("InstallGRUB-heading"), diui_png("InstallComplete")
found = true
end