summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-10-12 11:37:53 +0200
committerHolger Levsen <holger@layer-acht.org>2016-10-13 00:30:46 +0200
commitf7a71b63fbbc2ce2b1906d83bfb56883673e1ce6 (patch)
tree034079ede710bcb3a14696bc0534abc41a08871a
parent2c9c12fc4c3124239891d2207b2e7774f726b69d (diff)
downloadjenkins.debian.net-f7a71b63fbbc2ce2b1906d83bfb56883673e1ce6.tar.xz
lvc: reenable KDE test, and tidy slighty
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--cucumber/features/images/d-i_text_DesktopTask_Yes.pngbin3841 -> 2700 bytes
-rw-r--r--cucumber/features/install.feature13
2 files changed, 7 insertions, 6 deletions
diff --git a/cucumber/features/images/d-i_text_DesktopTask_Yes.png b/cucumber/features/images/d-i_text_DesktopTask_Yes.png
index f5a7e22b..4a000685 100644
--- a/cucumber/features/images/d-i_text_DesktopTask_Yes.png
+++ b/cucumber/features/images/d-i_text_DesktopTask_Yes.png
Binary files differ
diff --git a/cucumber/features/install.feature b/cucumber/features/install.feature
index a62d7264..3403d149 100644
--- a/cucumber/features/install.feature
+++ b/cucumber/features/install.feature
@@ -10,18 +10,18 @@ Feature: Doing variations on d-i installs
Examples:
| install_ui | target_ui | login |
- | gui | LXDE | LXDE |
-# | gui | KDE | KDE |
+# | gui | Gnome | Gnome | # FIXME -- X fails to start at present -- possibly related to "qxl too old" seen on flickering console, which seems like it might be something to do with 'spice'
| gui | minimal | VT |
+ | gui | LXDE | LXDE |
| gui | XFCE | XFCE |
+ | gui | KDE | KDE |
# | text | non-GUI | VT |
-# | gui | Gnome Desktop | Gnome |
@broken
- Scenario: Attempt to Install KDE, expecting it to fail because #818970
+ Scenario: Attempt to Install Gnome, expecting it to fail because X doesn't start for some reason
Given I have started Debian Installer in text mode and stopped at the Tasksel prompt
And I intend to use text mode
- And I select the KDE task
+ And I select the Gnome task
And I wait while the bulk of the packages are installed
And I install GRUB
And I allow reboot after the install is complete
@@ -29,13 +29,14 @@ Feature: Doing variations on d-i installs
And I power off the computer
And the computer is set to boot from ide drive "#{JOB_NAME}"
When I start the computer
- Then I should see a KDE Login prompt
+ Then I should see a Gnome Login prompt
# Scenario: Get a useful error from a bogus HTTP proxy
# Given I get d-i to the HTTP proxy prompt
# When I set the proxy to "127.23.23.23"
# Then I should get an error message that mentions the proxy
+ # this is useful for just proving that the d-i image is able to boot
@trivial
Scenario: Minimal Boot test
Given a disk is created for Debian Installer tests