summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-12-19 02:58:39 +0100
committerHolger Levsen <holger@layer-acht.org>2014-12-21 09:47:01 +0100
commitef72ef266ebaf93aa7b16cd642105d9fd01cf829 (patch)
treef2b1190cccb16b507aead6bdebf1b8c19bd28017
parent2eba6879e539d8a793542857fd7e45bb572545ef (diff)
downloadjenkins.debian.net-ef72ef266ebaf93aa7b16cd642105d9fd01cf829.tar.xz
lvc: code cleanup: remove 'enable more Tails Greeter options' scenario
-rw-r--r--features/apt.feature1
-rw-r--r--features/root_access_control.feature6
-rw-r--r--features/step_definitions/common_steps.rb8
3 files changed, 2 insertions, 13 deletions
diff --git a/features/apt.feature b/features/apt.feature
index 88174af9..3ee9e435 100644
--- a/features/apt.feature
+++ b/features/apt.feature
@@ -10,7 +10,6 @@ Feature: Installing packages through APT
And I capture all network traffic
And I start the computer
And the computer boots DebianLive7
- And I enable more Tails Greeter options
And I set sudo password "asdf"
And I log in to a new session
And GNOME has started
diff --git a/features/root_access_control.feature b/features/root_access_control.feature
index 9aa45de8..47aa0bc7 100644
--- a/features/root_access_control.feature
+++ b/features/root_access_control.feature
@@ -14,8 +14,7 @@ Feature: Root access control enforcement
And I save the state so the background can be restored next scenario
Scenario: If an administrative password is set in Tails Greeter the live user should be able to run arbitrary commands with administrative privileges.
- Given I enable more Tails Greeter options
- And I set sudo password "asdf"
+ Given I set sudo password "asdf"
And I log in to a new session
And Tails Greeter has dealt with the sudo password
Then I should be able to run administration commands as the live user
@@ -28,8 +27,7 @@ Feature: Root access control enforcement
And I should not be able to run administration commands as the live user with the "live" password
Scenario: If an administrative password is set in Tails Greeter the live user should be able to get administrative privileges through PolicyKit
- Given I enable more Tails Greeter options
- And I set sudo password "asdf"
+ Given I set sudo password "asdf"
And I log in to a new session
And Tails Greeter has dealt with the sudo password
And GNOME has started
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 2af74d97..3f463779 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -240,14 +240,6 @@ Given /^I log in to a new session$/ do
@screen.wait_and_click('TailsGreeterLoginButton.png', 10)
end
-Given /^I enable more Tails Greeter options$/ do
- next if @skip_steps_while_restoring_background
- match = @screen.find('TailsGreeterMoreOptions.png')
- @screen.click(match.getCenter.offset(match.w/2, match.h*2))
- @screen.wait_and_click('TailsGreeterForward.png', 10)
- @screen.wait('TailsGreeterLoginButton.png', 20)
-end
-
Given /^I set sudo password "([^"]*)"$/ do |password|
@sudo_password = password
next if @skip_steps_while_restoring_background