summaryrefslogtreecommitdiffstats
path: root/features
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-23 15:44:04 +0000
committerintrigeri <intrigeri@boum.org>2016-05-23 15:44:04 +0000
commit32ce0e858ceb6839642bbf3cd2b99d0192f79cf0 (patch)
treec071ec31d299a548bbacfb30685c4de8ef05bdba /features
parentcb1196fd388f053a0d651bc1400e2908b8cfe596 (diff)
parent3b64e74d438b5b1f0db40a7dfeef4d77c528b0ba (diff)
Merge branch 'test/10497-tor-bootstrap-is-fragile' into test/10381-fix-I-open-the-address-test-is-fragile
Diffstat (limited to 'features')
-rw-r--r--features/checks.feature2
-rw-r--r--features/i2p.feature2
-rw-r--r--features/step_definitions/common_steps.rb2
3 files changed, 5 insertions, 1 deletions
diff --git a/features/checks.feature b/features/checks.feature
index e514202..bbda069 100644
--- a/features/checks.feature
+++ b/features/checks.feature
@@ -50,6 +50,8 @@ Feature: Various checks
And all notifications have disappeared
And the time has synced
+ #11463
+ @fragile
Scenario: The 'Tor is ready' notification is shown when Tor has bootstrapped
Given I have started Tails from DVD without network and logged in
And the network is plugged
diff --git a/features/i2p.feature b/features/i2p.feature
index 9ebfd60..d09ff2c 100644
--- a/features/i2p.feature
+++ b/features/i2p.feature
@@ -86,6 +86,8 @@ Feature: I2P
When I start the I2P Browser through the GNOME menu
Then the I2P router console is displayed in I2P Browser
+ #11462
+ @fragile
Scenario: I2P displays a notice when it fails to start
Given I have started Tails from DVD with I2P enabled and logged in
And I2P is not running
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index ec892af..57b5903 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -366,7 +366,7 @@ Given /^the Tails desktop is ready$/ do
# instead do this programmatically with xdotool.
if florence_keyboard_is_visible
@screen.click("GnomeSystrayFlorence.png")
- try_for(10) { ! florence_keyboard_is_visible }
+ try_for(2) { ! florence_keyboard_is_visible }
end
end