lvc: use XFCE as the Desktop target for now

6 files changed, 50 insertions, 14 deletions

diff --git a/cucumber/features/images/DebianLoginPromptXFCE.png b/cucumber/features/images/DebianLoginPromptXFCE.png
new file mode 100644
index 00000000..f2892b79
--- /dev/null
+++ b/cucumber/features/images/DebianLoginPromptXFCE.png
diff --git a/cucumber/features/images/d-i_gui_Desktop+XFCE.png b/cucumber/features/images/d-i_gui_Desktop+XFCE.png
new file mode 100644
index 00000000..227b8814
--- /dev/null
+++ b/cucumber/features/images/d-i_gui_Desktop+XFCE.png
diff --git a/cucumber/features/images/d-i_text_Desktop+XFCE.png b/cucumber/features/images/d-i_text_Desktop+XFCE.png
new file mode 100644
index 00000000..bb4a2895
--- /dev/null
+++ b/cucumber/features/images/d-i_text_Desktop+XFCE.png
diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature
index 1639c548..57269c8f 100644
--- a/cucumber/features/install.feature
+++ b/cucumber/features/install.feature
@@ -6,16 +6,18 @@ Feature: Doing variations on d-i installs
   Scenario Outline: Install Debian, and boot to a login prompt
     Given I install a <target_ui> Debian system, in <install_ui> mode
     When I start the computer
-    Then I should see a Login prompt
+    Then I should see a <login> Login prompt
 
     Examples:
-      | install_ui | target_ui     |
-      | gui        | Minimal       |
-      | gui        | non-GUI       |
-#      | gui       | Gnome Desktop |
-      | text       | Minimal       |
-      | text       | non-GUI       |
-#      | text       | Gnome Desktop |
+      | install_ui | target_ui     | login |
+      | gui        | Minimal       | VT    |
+      | gui        | non-GUI       | VT    |
+      | gui        | XFCE Desktop  | XFCE  |
+#      | gui        | Gnome Desktop | Gnome |
+      | text       | Minimal       | VT    |
+      | text       | non-GUI       | VT    |
+      | text       | XFCE Desktop  | XFCE  |
+#      | text       | Gnome Desktop | Gnome |
 
 #  Scenario: Get a useful error from a bogus HTTP proxy
 #    Given I get d-i to the HTTP proxy prompt
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index a4c62210..810a5058 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -440,15 +440,17 @@ Given /^in ([a-z]*) mode I unset the Desktop and Print tasks$/ do |ui_mode|
   @screen.type(Sikuli::Key.ENTER)
 end
 
-Given /^in ([a-z]*) mode I select the Desktop task$/ do |ui_mode|
+Given /^in ([a-z]*) mode I select the ([a-zA-Z]*) Desktop task$/ do |ui_mode,desktop|
   @screen.wait(diui_png("DesktopTask_Yes",ui_mode), 2 * 60)
 
   # deal with post-snapshot screen flicker -- FIXME this needs to be fixed via looking to see if the remote login is working before we look at the screen
   debug_log("debug: Found DesktopTask_Yes, pausing for 20s", :color => :blue)
   sleep(20)
 
-  @screen.type(Sikuli::Key.DOWN+Sikuli::Key.SPACE)
-  @screen.wait(diui_png("Desktop+Gnome",ui_mode), 10)
+  @screen.type(Sikuli::Key.DOWN)
+  @screen.type(Sikuli::Key.DOWN) if "XFCE" == desktop
+  @screen.type(Sikuli::Key.SPACE)
+  @screen.wait(diui_png("Desktop+" + desktop,ui_mode), 10)
   if "gui" == ui_mode
     @screen.wait(diui_png("CONTINUEunselected",ui_mode), 10)
     @screen.type(Sikuli::Key.TAB)
@@ -513,10 +515,14 @@ Given /^I wait for the reboot$/ do
   @screen.wait(bootsplash, 10 * 60)
 end
 
-Given /^I should see a Login prompt$/ do
+Given /^I should see a console Login prompt$/ do
   @screen.wait("DebianLoginPromptVT.png", 20 * 60)
 end
 
+Given /^I should see a XFCE Login prompt$/ do
+  @screen.wait("DebianLoginPromptXFCE.png", 20 * 60)
+end
+
 def bootsplash
   case @os_loader
   when "UEFI"
diff --git a/cucumber/features/step_definitions/snapshots.rb b/cucumber/features/step_definitions/snapshots.rb
index 452f0598..66c89747 100644
--- a/cucumber/features/step_definitions/snapshots.rb
+++ b/cucumber/features/step_definitions/snapshots.rb
@@ -105,7 +105,7 @@ def checkpoints
       :description => "I install a Gnome Desktop Debian system, in text mode",
       :parent_checkpoint => 'boot-d-i-to-tasksel',
       :steps => [
-	'in text mode I select the Desktop task',
+	'in text mode I select the Gnome Desktop task',
 	'in text mode I wait while the vast bulk of the packages are installed',
 	'in text mode I install GRUB',
 	'in text mode I allow reboot after the install is complete',
@@ -119,7 +119,35 @@ def checkpoints
       :description => "I install a Gnome Desktop Debian system, in gui mode",
       :parent_checkpoint => 'boot-g-i-to-tasksel',
       :steps => [
-	'in gui mode I select the Desktop task',
+	'in gui mode I select the Gnome Desktop task',
+	'in gui mode I wait while the vast bulk of the packages are installed',
+	'in gui mode I install GRUB',
+	'in gui mode I allow reboot after the install is complete',
+	'I wait for the reboot',
+	'I power off the computer',
+	'the computer is set to boot from ide drive "target"',
+      ],
+    },
+
+    'debian-xfce-install' => {
+      :description => "I install a XFCE Desktop Debian system, in text mode",
+      :parent_checkpoint => 'boot-d-i-to-tasksel',
+      :steps => [
+	'in text mode I select the XFCE Desktop task',
+	'in text mode I wait while the vast bulk of the packages are installed',
+	'in text mode I install GRUB',
+	'in text mode I allow reboot after the install is complete',
+	'I wait for the reboot',
+	'I power off the computer',
+	'the computer is set to boot from ide drive "target"',
+      ],
+    },
+
+    'debian-gui-xfce-install' => {
+      :description => "I install a XFCE Desktop Debian system, in gui mode",
+      :parent_checkpoint => 'boot-g-i-to-tasksel',
+      :steps => [
+	'in gui mode I select the XFCE Desktop task',
 	'in gui mode I wait while the vast bulk of the packages are installed',
 	'in gui mode I install GRUB',
 	'in gui mode I allow reboot after the install is complete',