summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-27 12:01:27 +0000
committerintrigeri <intrigeri@boum.org>2016-05-27 12:01:27 +0000
commit6aef89beb684d8022b936edb465bd6a4cbfce2e8 (patch)
treef51996b22a4bfd600fab3d3bbde0e88831adecfe
parent188a027bc21632b1bfd3a86a6bd6ab512751217e (diff)
parentd58bb67d165cfa04e08c30447d297df793185835 (diff)
Merge branch 'test/10497-tor-bootstrap-is-fragile' into test/10971-more-CPUs-for-TailsToaster
-rw-r--r--features/encryption.feature3
-rw-r--r--features/evince.feature2
-rw-r--r--features/i2p.feature2
-rw-r--r--features/localization.feature1
-rw-r--r--features/persistence.feature3
-rw-r--r--features/root_access_control.feature2
-rw-r--r--features/step_definitions/common_steps.rb37
-rw-r--r--features/unsafe_browser.feature6
-rw-r--r--features/untrusted_partitions.feature1
-rw-r--r--features/usb_install.feature4
-rw-r--r--features/usb_upgrade.feature1
11 files changed, 31 insertions, 31 deletions
diff --git a/features/encryption.feature b/features/encryption.feature
index 608af8f..d4426f7 100644
--- a/features/encryption.feature
+++ b/features/encryption.feature
@@ -29,8 +29,7 @@ Feature: Encryption and verification using GnuPG
And I both encrypt and sign the message using my OpenPGP key
Then I can decrypt and verify the encrypted message
- #11394
- #11398
+ # 11394
@fragile
Scenario: Symmetric encryption and decryption using OpenPGP Applet
When I type a message into gedit
diff --git a/features/evince.feature b/features/evince.feature
index b413add..6fd27ec 100644
--- a/features/evince.feature
+++ b/features/evince.feature
@@ -21,8 +21,6 @@ Feature: Using Evince
Then I see "CupsTestPage.png" after at most 20 seconds
And I can print the current document to "/home/amnesia/output.pdf"
- #11398
- @fragile
Scenario: I cannot view a PDF file stored in non-persistent /home/amnesia/.gnupg
Given I have started Tails from DVD without network and logged in
And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia/.gnupg" as user "amnesia"
diff --git a/features/i2p.feature b/features/i2p.feature
index 3c318ab..616c5ff 100644
--- a/features/i2p.feature
+++ b/features/i2p.feature
@@ -27,7 +27,7 @@ Feature: I2P
Then the I2P router console is displayed in I2P Browser
And the I2P Browser uses all expected TBB shared libraries
- #11401, #11457, #11458
+ #11457, #11458
@fragile
Scenario: Closing the I2P Browser shows a stop notification and properly tears down the chroot.
Given I have started Tails from DVD with I2P enabled and logged in and the network is connected
diff --git a/features/localization.feature b/features/localization.feature
index fa49c3a..4ec4a05 100644
--- a/features/localization.feature
+++ b/features/localization.feature
@@ -9,7 +9,6 @@ Feature: Localization
Given I have started Tails from DVD without network and stopped at Tails Greeter's login screen
And the network is plugged
And I log in to a new session in German
- And Tails seems to have booted normally
And Tor is ready
When I double-click the Report an Error launcher on the desktop
Then the support documentation page opens in Tor Browser
diff --git a/features/persistence.feature b/features/persistence.feature
index 654b6cd..42f91de 100644
--- a/features/persistence.feature
+++ b/features/persistence.feature
@@ -7,8 +7,7 @@ Feature: Tails persistence
Scenario: Booting Tails from a USB drive with a disabled persistent partition
Given I have started Tails without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
When I log in to a new session
- Then Tails seems to have booted normally
- And Tails is running from USB drive "__internal"
+ Then Tails is running from USB drive "__internal"
And persistence is disabled
But a Tails persistence partition exists on USB drive "__internal"
diff --git a/features/root_access_control.feature b/features/root_access_control.feature
index 800da98..fea20ff 100644
--- a/features/root_access_control.feature
+++ b/features/root_access_control.feature
@@ -21,8 +21,6 @@ Feature: Root access control enforcement
And running a command as root with pkexec requires PolicyKit administrator privileges
Then I should be able to run a command as root with pkexec
- #11398
- @fragile
Scenario: If no administrative password is set in Tails Greeter the live user should not be able to get administrative privileges through PolicyKit with the standard passwords.
Given I have started Tails from DVD without network and logged in
And running a command as root with pkexec requires PolicyKit administrator privileges
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index f30933d..fe70291 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -84,10 +84,8 @@ def robust_notification_wait(notification_image, time_to_wait)
found
end
- # Click anywhere to close the notification applet
- @screen.hide_cursor
- @screen.click("GnomeApplicationsMenu.png")
- @screen.hide_cursor
+ # Close the notification applet
+ @screen.type(Sikuli::Key.ESC)
end
def post_snapshot_restore_hook
@@ -201,7 +199,6 @@ Given /^I start Tails( from DVD)?( with network unplugged)?( and I login)?$/ do
step "the computer boots Tails"
if do_login
step "I log in to a new session"
- step "Tails seems to have booted normally"
if network_unplugged.nil?
step "Tor is ready"
step "all notifications have disappeared"
@@ -230,7 +227,6 @@ Given /^I start Tails from (.+?) drive "(.+?)"(| with network unplugged)( and I
end
end
step "I log in to a new session"
- step "Tails seems to have booted normally"
if network_unplugged.empty?
step "Tor is ready"
step "all notifications have disappeared"
@@ -335,6 +331,13 @@ Given /^Tails Greeter has dealt with the sudo password$/ do
}
end
+def florence_keyboard_is_visible
+ $vm.execute(
+ "xdotool search --all --onlyvisible --maxdepth 1 --classname 'Florence'",
+ :user => LIVE_USER,
+ ).success?
+end
+
Given /^the Tails desktop is ready$/ do
desktop_started_picture = "GnomeApplicationsMenu#{@language}.png"
# We wait for the Florence icon to be displayed to ensure reliable systray icon clicking.
@@ -352,11 +355,15 @@ Given /^the Tails desktop is ready$/ do
'gsettings set org.gnome.desktop.interface toolkit-accessibility true',
:user => LIVE_USER,
)
-
-end
-
-Then /^Tails seems to have booted normally$/ do
- step "the Tails desktop is ready"
+ # Sometimes the Florence window is not hidden on startup (#11398).
+ # Whenever that's the case, hide it ourselves and verify that it vanishes.
+ # I could not find that window using Accerciser, so I'm not using dogtail;
+ # and it doesn't feel worth it to add an image and use Sikuli, since we can
+ # instead do this programmatically with xdotool.
+ if florence_keyboard_is_visible
+ @screen.click("GnomeSystrayFlorence.png")
+ try_for(2) { ! florence_keyboard_is_visible }
+ end
end
When /^I see the 'Tor is ready' notification$/ do
@@ -425,8 +432,12 @@ Given /^the Tor Browser has a bookmark to eff.org$/ do
end
Given /^all notifications have disappeared$/ do
- next if not(@screen.exists("GnomeNotificationApplet.png"))
- @screen.click("GnomeNotificationApplet.png")
+ begin
+ @screen.click("GnomeNotificationApplet.png")
+ rescue FindFailed
+ # No notifications, so we're done here.
+ return
+ end
@screen.wait("GnomeNotificationAppletOpened.png", 10)
begin
entries = @screen.findAll("GnomeNotificationEntry.png")
diff --git a/features/unsafe_browser.feature b/features/unsafe_browser.feature
index d63968f..a0a26fa 100644
--- a/features/unsafe_browser.feature
+++ b/features/unsafe_browser.feature
@@ -4,7 +4,7 @@ Feature: Browsing the web using the Unsafe Browser
when I browse the web using the Unsafe Browser
I should have direct access to the web
- #11401, #11458
+ #11458
@fragile
Scenario: The Unsafe Browser can access the LAN
Given I have started Tails from DVD and logged in and the network is connected
@@ -36,7 +36,7 @@ Feature: Browsing the web using the Unsafe Browser
Then I see the Unsafe Browser stop notification
And the Unsafe Browser chroot is torn down
- #11401, #11458
+ #11458
@fragile
Scenario: Starting a second instance of the Unsafe Browser results in an error message being shown.
Given I have started Tails from DVD and logged in and the network is connected
@@ -44,7 +44,7 @@ Feature: Browsing the web using the Unsafe Browser
And I start the Unsafe Browser
Then I see a warning about another instance already running
- #11401, #11458
+ #11458
@fragile
Scenario: The Unsafe Browser cannot be configured to use Tor and other local proxies.
Given I have started Tails from DVD and logged in and the network is connected
diff --git a/features/untrusted_partitions.feature b/features/untrusted_partitions.feature
index 5549013..b1045c4 100644
--- a/features/untrusted_partitions.feature
+++ b/features/untrusted_partitions.feature
@@ -50,7 +50,6 @@ Feature: Untrusted partitions
And I set Tails to boot with options "live-media="
When I start Tails with network unplugged and I login
Then Tails is running from ide drive "live_hd"
- And Tails seems to have booted normally
Scenario: Tails booting from a DVD does not use live systems stored on hard drives
Given a computer
diff --git a/features/usb_install.feature b/features/usb_install.feature
index 750df7a..e8ce2fe 100644
--- a/features/usb_install.feature
+++ b/features/usb_install.feature
@@ -42,7 +42,6 @@ Feature: Installing Tails to a USB drive
Scenario: Booting Tails from a USB drive without a persistent partition and creating one
Given I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen
And I log in to a new session
- Then Tails seems to have booted normally
When I create a persistent partition
Then a Tails persistence partition exists on USB drive "__internal"
@@ -51,8 +50,7 @@ Feature: Installing Tails to a USB drive
Scenario: Booting Tails from a USB drive without a persistent partition
Given I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen
When I log in to a new session
- Then Tails seems to have booted normally
- And Tails is running from USB drive "__internal"
+ Then Tails is running from USB drive "__internal"
And the persistent Tor Browser directory does not exist
And there is no persistence partition on USB drive "__internal"
diff --git a/features/usb_upgrade.feature b/features/usb_upgrade.feature
index 422596d..fc61308 100644
--- a/features/usb_upgrade.feature
+++ b/features/usb_upgrade.feature
@@ -112,7 +112,6 @@ Feature: Upgrading an old Tails USB installation
Scenario: Upgrading an old Tails USB installation from another Tails USB drive
Given I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen
And I log in to a new session
- And Tails seems to have booted normally
And I clone USB drive "old" to a new USB drive "to_upgrade"
And I plug USB drive "to_upgrade"
When I "Clone & Upgrade" Tails to USB drive "to_upgrade"