lvc: Debian-Edu: wait for disk partitioning

3 files changed, 13 insertions, 0 deletions

diff --git a/cucumber/features/images/d-i_gui_PartitionDisks.png b/cucumber/features/images/d-i_gui_PartitionDisks.png
new file mode 100644
index 00000000..809c4f42
--- /dev/null
+++ b/cucumber/features/images/d-i_gui_PartitionDisks.png
diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature
index 0a62850b..d5612324 100644
--- a/cucumber/features/install.feature
+++ b/cucumber/features/install.feature
@@ -95,6 +95,9 @@ Feature: Doing variations on d-i installs
     And I ignore Popcon
     And I set the root password to "rootme"
     And I set the password for "Philip Hands" to be "verysecret"
+    And I wait while the partitions are made
+    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
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 6dac688d..ce4a38f5 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -532,6 +532,16 @@ Given /^I select the ([A-Z][[:alpha:]]*) task$/ do |desktop|
   @screen.waitVanish(diui_png(expected_result), 10 * PATIENCE)
 end
 
+Given /^I wait while the partitions are made$/ do
+  @screen.wait(diui_png("PartitionDisks"), 60)
+  debug_log("debug: we see PartitionDisks", :color => :blue)
+  @screen.waitVanish(diui_png("PartitionDisks"), 2 * 60)
+end
+
+Given /^I wait patiently for the package installation to start$/ do
+  @screen.wait(diui_png("InstallSoftware"), 10 * 60)
+end
+
 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)