summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-04-08 21:57:52 +0200
committerTails developers <amnesia@boum.org>2014-04-08 22:00:06 +0200
commitc02709146741480a1aa86cfe236f3464bb96ab30 (patch)
tree92ceb72599e7d8498b3cf712923aeb1e5c9d7b2b
parentf275db5af0d88301fed94d5656fff38feba5fa37 (diff)
Only wait for notifications to disappear.
In Wheezy's GNOME all notifications disappear quickly, so we don't have to actively close them, which has proven to be a bit error prone.
-rw-r--r--features/apt.feature2
-rw-r--r--features/checks.feature8
-rw-r--r--features/encryption.feature2
-rw-r--r--features/firewall_leaks.feature2
-rw-r--r--features/step_definitions/common_steps.rb27
-rw-r--r--features/step_definitions/usb.rb2
-rw-r--r--features/torified_browsing.feature2
-rw-r--r--features/torified_gnupg.feature2
-rw-r--r--features/truecrypt.feature2
-rw-r--r--features/unsafe_browser.feature2
-rw-r--r--features/usb_install.feature26
-rw-r--r--features/winxp.feature4
-rw-r--r--wiki/src/contribute/release_process/test/automated_tests.mdwn4
13 files changed, 31 insertions, 54 deletions
diff --git a/features/apt.feature b/features/apt.feature
index aa932c3..f1329f5 100644
--- a/features/apt.feature
+++ b/features/apt.feature
@@ -15,7 +15,7 @@ Feature: Installing packages through APT
And I log in to a new session
And GNOME has started
And Tor is ready
- And I have closed all annoying notifications
+ And all notifications have disappeared
And available upgrades have been checked
And I save the state so the background can be restored next scenario
diff --git a/features/checks.feature b/features/checks.feature
index 8de0851..3118ea0 100644
--- a/features/checks.feature
+++ b/features/checks.feature
@@ -8,7 +8,7 @@ Feature: Various checks
And the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I save the state so the background can be restored next scenario
# FIXME: #5972
@@ -19,7 +19,7 @@ Feature: Various checks
Scenario: The shipped Tails signing key is up-to-date
Given the network is plugged
And Tor is ready
- And I have closed all annoying notifications
+ And all notifications have disappeared
Then the shipped Tails signing key is not outdated
Scenario: The live user is setup correctly
@@ -31,7 +31,7 @@ Feature: Various checks
Given I wait between 30 and 60 seconds
When the network is plugged
And Tor is ready
- And I have closed all annoying notifications
+ And all notifications have disappeared
And process "vidalia" is running
And the time has synced
@@ -52,5 +52,5 @@ Feature: Various checks
And the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
Then MAT can clean some sample PDF file
diff --git a/features/encryption.feature b/features/encryption.feature
index 15bb424..7e70ab3 100644
--- a/features/encryption.feature
+++ b/features/encryption.feature
@@ -11,7 +11,7 @@ Feature: Encryption and verification using GnuPG
And the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I generate an OpenPGP key named "test" with password "asdf"
And I save the state so the background can be restored next scenario
diff --git a/features/firewall_leaks.feature b/features/firewall_leaks.feature
index f28beed..093a0b2 100644
--- a/features/firewall_leaks.feature
+++ b/features/firewall_leaks.feature
@@ -10,7 +10,7 @@ Feature:
And the computer boots Tails
And I log in to a new session
And Tor is ready
- And I have closed all annoying notifications
+ And all notifications have disappeared
And available upgrades have been checked
And all Internet traffic has only flowed through Tor
And I save the state so the background can be restored next scenario
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index d6846fd..fe0239a 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -261,7 +261,7 @@ Given /^Iceweasel has started and is not loading a web page$/ do
@screen.type("about:blank" + Sikuli::Key.ENTER)
end
-Given /^I have closed all annoying notifications$/ do
+Given /^all notifications have disappeared$/ do
next if @skip_steps_while_restoring_background
case @theme
when "winxp"
@@ -269,30 +269,7 @@ Given /^I have closed all annoying notifications$/ do
else
notification_picture = "GnomeNotificationX.png"
end
-
- # First we wait a short while to give notifications a chance to show
- begin
- @screen.wait(notification_picture, 10)
- rescue
- # noop
- end
-
- begin
- # note that we cannot use find_all as the resulting matches will
- # have the positions from before we start closing notifications,
- # but closing them will change the positions.
-
- # Move the mouse pointer out of the way, so that the cross to close
- # the first notification is not highlighted and can be found.
- @screen.hide_cursor
- while match = @screen.find(notification_picture)
- @screen.click(match)
- # ... same for the next notification:
- @screen.hide_cursor
- end
- rescue FindFailed
- # noop
- end
+ @screen.waitVanish(notification_picture, 60)
end
Given /^I save the state so the background can be restored next scenario$/ do
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index 9909f0d..f4ab322 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -428,7 +428,7 @@ Then /^only the expected files should persist on USB drive "([^"]+)"$/ do |name|
step "I log in to a new session"
step "persistence is enabled"
step "GNOME has started"
- step "I have closed all annoying notifications"
+ step "all notifications have disappeared"
step "the expected persistent files are present in the filesystem"
step "I completely shutdown Tails"
end
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index 5eb4010..7ad6ad1 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -13,7 +13,7 @@ Feature: Browsing the web using Iceweasel
And GNOME has started
And Tor is ready
And available upgrades have been checked
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I save the state so the background can be restored next scenario
Scenario: Opening check.torproject.org in Iceweasel shows the green onion and the congratulations message
diff --git a/features/torified_gnupg.feature b/features/torified_gnupg.feature
index bc3573b..a582068 100644
--- a/features/torified_gnupg.feature
+++ b/features/torified_gnupg.feature
@@ -13,7 +13,7 @@ Feature: Keyserver interaction with GnuPG
And I log in to a new session
And GNOME has started
And Tor is ready
- And I have closed all annoying notifications
+ And all notifications have disappeared
And available upgrades have been checked
And the "10CC5BC7" OpenPGP key is not in the live user's public keyring
And I save the state so the background can be restored next scenario
diff --git a/features/truecrypt.feature b/features/truecrypt.feature
index ab10c80..8c884a0 100644
--- a/features/truecrypt.feature
+++ b/features/truecrypt.feature
@@ -11,7 +11,7 @@ Feature: TrueCrypt
And the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
When I start TrueCrypt through the GNOME menu
And I deal with the removal warning prompt
Then I see "TrueCryptWindow.png" after at most 60 seconds
diff --git a/features/unsafe_browser.feature b/features/unsafe_browser.feature
index cb96ca2..d1e8908 100644
--- a/features/unsafe_browser.feature
+++ b/features/unsafe_browser.feature
@@ -11,7 +11,7 @@ Feature: Browsing the web using the Unsafe Browser
And I log in to a new session
And GNOME has started
And Tor is ready
- And I have closed all annoying notifications
+ And all notifications have disappeared
And available upgrades have been checked
And I save the state so the background can be restored next scenario
diff --git a/features/usb_install.feature b/features/usb_install.feature
index 9a8a21f..5833d7b 100644
--- a/features/usb_install.feature
+++ b/features/usb_install.feature
@@ -14,7 +14,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
When the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I create a new 4 GiB USB drive named "current"
And I plug USB drive "current"
And I "Clone & Install" Tails to USB drive "current"
@@ -32,7 +32,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And the boot device has safe access rights
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
Then Tails seems to have booted normally
And Tails is running from USB drive "current"
And the boot device has safe access rights
@@ -67,7 +67,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And I enable persistence with password "asdf"
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And persistence is enabled
And I write some files expected to persist
And persistent filesystems have safe access rights
@@ -87,7 +87,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And I enable read-only persistence with password "asdf"
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And persistence is enabled
And I write some files not expected to persist
And I remove some files expected to persist
@@ -107,7 +107,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And Tails seems to have booted normally
And persistence is disabled
But a Tails persistence partition with password "asdf" exists on USB drive "current"
- And I have closed all annoying notifications
+ And all notifications have disappeared
When I delete the persistent partition
Then there is no persistence partition on USB drive "current"
@@ -120,7 +120,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
When the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I create a new 4 GiB USB drive named "old"
And I plug USB drive "old"
And I "Clone & Install" Tails to USB drive "old"
@@ -138,7 +138,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And Tails is running from USB drive "old"
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I create a persistent partition with password "asdf"
Then a Tails persistence partition with password "asdf" exists on USB drive "old"
And I completely shutdown Tails
@@ -154,7 +154,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And I enable persistence with password "asdf"
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And persistence is enabled
And I write some files expected to persist
And persistent filesystems have safe access rights
@@ -172,7 +172,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I plug USB drive "to_upgrade"
And I "Clone & Upgrade" Tails to USB drive "to_upgrade"
Then Tails is installed on USB drive "to_upgrade"
@@ -204,7 +204,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And the boot device has safe access rights
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I plug USB drive "to_upgrade"
And I "Clone & Upgrade" Tails to USB drive "to_upgrade"
Then Tails is installed on USB drive "to_upgrade"
@@ -237,7 +237,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
And the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I plug USB drive "to_upgrade"
And I do a "Upgrade from ISO" on USB drive "to_upgrade"
Then Tails is installed on USB drive "to_upgrade"
@@ -268,7 +268,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
When the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I plug USB drive "mbr"
And I "Clone & Install" Tails to USB drive "mbr"
Then Tails is installed on USB drive "mbr"
@@ -309,7 +309,7 @@ Feature: Installing Tails to a USB drive, upgrading it, and using persistence
When the computer boots Tails
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I plug USB drive "isohybrid"
And I try a "Clone & Upgrade" Tails to USB drive "isohybrid"
But I am suggested to do a "Clone & Install"
diff --git a/features/winxp.feature b/features/winxp.feature
index 341b8f0..2a6cd89 100644
--- a/features/winxp.feature
+++ b/features/winxp.feature
@@ -13,7 +13,7 @@ Feature: Microsoft Windows XP Camouflage
And I enable Microsoft Windows XP camouflage
And I log in to a new session
And GNOME has started
- And I have closed all annoying notifications
+ And all notifications have disappeared
And I save the state so the background can be restored next scenario
Scenario: I should be presented with a Microsoft Windows XP like desktop
@@ -25,7 +25,7 @@ Feature: Microsoft Windows XP Camouflage
Scenario: Windows should appear like those in Microsoft Windows XP
When the network is plugged
And Tor is ready
- And I have closed all annoying notifications
+ And all notifications have disappeared
And available upgrades have been checked
And I run "iceweasel"
Then I see "WinXPIceweaselWindow.png" after at most 120 seconds
diff --git a/wiki/src/contribute/release_process/test/automated_tests.mdwn b/wiki/src/contribute/release_process/test/automated_tests.mdwn
index c61cc5d..3ee785c 100644
--- a/wiki/src/contribute/release_process/test/automated_tests.mdwn
+++ b/wiki/src/contribute/release_process/test/automated_tests.mdwn
@@ -208,10 +208,10 @@ All these should be pretty obvious. It could be mentioned that the
last two steps, like many others, depend on the remote shell to
be working.
- And I have closed all annoying notifications
+ And all notifications have disappeared
The notifications can block GUI elements that we're looking for later
-with Sikuli, so they are to be closed whenever for essentially all
+with Sikuli, so it's important that they are gone in essentially all
tests of GUI applications. If we have a network connection, so the
time syncing starts and shows its notifications, then this step should be
run after the previous step. Otherwise it always depends on the `GNOME