summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-12-23 12:23:50 +0000
committerintrigeri <intrigeri@boum.org>2016-12-23 12:23:50 +0000
commit60b30c8be78a1058652ae9abebf24a72c514f236 (patch)
treeba44947e459e91fb4f63783315613987fce1699f
parent7071d8efb094b19e1bb42e8205d92a0a210e3259 (diff)
parente83696397ae1c09dd56ec4b67d17c97d0a232f4b (diff)
Merge branch 'feature/stretch' into feature/8230-greeter-revamp-phase1
-rw-r--r--features/images/GitCloneDone.pngbin2974 -> 1741 bytes
-rw-r--r--features/images/GpgAppletManageKeys.pngbin1494 -> 1107 bytes
-rw-r--r--features/images/PidginAccountWindow.pngbin1385 -> 898 bytes
-rw-r--r--features/images/SeahorseWindow.pngbin2467 -> 1342 bytes
-rw-r--r--features/step_definitions/erase_memory.rb17
-rw-r--r--features/step_definitions/ssh.rb2
-rw-r--r--features/torified_browsing.feature2
-rw-r--r--features/torified_gnupg.feature1
8 files changed, 18 insertions, 4 deletions
diff --git a/features/images/GitCloneDone.png b/features/images/GitCloneDone.png
index f81dd59..edc9d37 100644
--- a/features/images/GitCloneDone.png
+++ b/features/images/GitCloneDone.png
Binary files differ
diff --git a/features/images/GpgAppletManageKeys.png b/features/images/GpgAppletManageKeys.png
index 7636f31..974b8da 100644
--- a/features/images/GpgAppletManageKeys.png
+++ b/features/images/GpgAppletManageKeys.png
Binary files differ
diff --git a/features/images/PidginAccountWindow.png b/features/images/PidginAccountWindow.png
index 08a3c32..1cc518c 100644
--- a/features/images/PidginAccountWindow.png
+++ b/features/images/PidginAccountWindow.png
Binary files differ
diff --git a/features/images/SeahorseWindow.png b/features/images/SeahorseWindow.png
index a868798..e8228d6 100644
--- a/features/images/SeahorseWindow.png
+++ b/features/images/SeahorseWindow.png
Binary files differ
diff --git a/features/step_definitions/erase_memory.rb b/features/step_definitions/erase_memory.rb
index 5828537..0966825 100644
--- a/features/step_definitions/erase_memory.rb
+++ b/features/step_definitions/erase_memory.rb
@@ -179,10 +179,25 @@ end
When /^I shutdown and wait for Tails to finish wiping the memory$/ do
$vm.spawn("halt")
- try_for(memory_wipe_timeout, { :msg => "memory wipe didn't finish, probably the VM crashed" }) do
+
+ check_if_memory_wipe_finished = Proc.new do
# We spam keypresses to prevent console blanking from hiding the
# image we're waiting for
@screen.type(" ")
@screen.find('MemoryWipeCompleted.png')
+ sleep 1
+ end
+
+ begin
+ retry_action(
+ memory_wipe_timeout,
+ :operation_name => "Checking if memory wipe has finished",
+ &check_if_memory_wipe_finished
+ )
+ rescue MaxRetriesFailure
+ puts "Cannot tell if memory wipe completed."
+ puts "One possible reason for this is a garbled display,"
+ puts "so let's go on and rely on the next steps to check"
+ puts "how well memory was wiped."
end
end
diff --git a/features/step_definitions/ssh.rb b/features/step_definitions/ssh.rb
index e998101..63b60b5 100644
--- a/features/step_definitions/ssh.rb
+++ b/features/step_definitions/ssh.rb
@@ -127,7 +127,7 @@ Then /^I connect to an SFTP server on the Internet$/ do
end
retry_tor(recovery_proc) do
- step 'I start "Files" via the GNOME "Accessories" applications menu'
+ step 'I start "Nautilus" via the GNOME "Accessories" applications menu'
@screen.wait_and_click("GnomeFilesConnectToServer.png", 10)
@screen.wait("GnomeConnectToServerWindow.png", 10)
@screen.type("sftp://" + @sftp_username + "@" + @sftp_host + ":" + @sftp_port)
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index 9ea1909..33e8f41 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -105,7 +105,7 @@ Feature: Browsing the web using the Tor Browser
Scenario: The "Tails documentation" link on the Desktop works
Given I have started Tails from DVD and logged in and the network is connected
When I double-click on the "Tails documentation" link on the Desktop
- Then I see "TailsOfflineDocHomepage.png" after at most 10 seconds
+ Then I see "TailsOfflineDocHomepage.png" after at most 20 seconds
Scenario: The Tor Browser uses TBB's shared libraries
Given I have started Tails from DVD and logged in and the network is connected
diff --git a/features/torified_gnupg.feature b/features/torified_gnupg.feature
index bba2744..8bbf10f 100644
--- a/features/torified_gnupg.feature
+++ b/features/torified_gnupg.feature
@@ -14,7 +14,6 @@ Feature: Keyserver interaction with GnuPG
Scenario: Fetching OpenPGP keys using GnuPG should work and be done over Tor.
When I fetch the "10CC5BC7" OpenPGP key using the GnuPG CLI
- Then GnuPG uses the configured keyserver
And the GnuPG fetch is successful
And the "10CC5BC7" key is in the live user's public keyring