summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-24 20:56:43 +0000
committerintrigeri <intrigeri@boum.org>2016-05-24 20:56:43 +0000
commit2b2b4e0ecbbd576bda1c8a1674c99327a8464621 (patch)
tree9757c515a944f1427ccbf35967b62f547ae39551
parent70b2bf26c307ddb97ca218617f9a912f3dfe7351 (diff)
parentf6103e10efd07d947fd20a73bdb0d58728478e04 (diff)
Merge remote-tracking branch 'origin/devel' into feature/6154-secure-autoconfig-in-icedove
-rw-r--r--features/checks.feature1
-rw-r--r--features/i2p.feature4
-rw-r--r--features/icedove.feature1
-rw-r--r--features/pidgin.feature2
4 files changed, 5 insertions, 3 deletions
diff --git a/features/checks.feature b/features/checks.feature
index aa242a1..3bbe2f4 100644
--- a/features/checks.feature
+++ b/features/checks.feature
@@ -51,6 +51,7 @@ Feature: Various checks
And all notifications have disappeared
And the time has synced
+ #10497, #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
diff --git a/features/i2p.feature b/features/i2p.feature
index cc64d54..876c72f 100644
--- a/features/i2p.feature
+++ b/features/i2p.feature
@@ -41,7 +41,7 @@ Feature: I2P
Then I see the I2P Browser stop notification
And the I2P Browser chroot is torn down
- #10497, #11114
+ #10497, #11114, #11465
@fragile
Scenario: The I2P internal websites can be viewed in I2P Browser
Given I have started Tails from DVD with I2P enabled and logged in and the network is connected
@@ -92,7 +92,7 @@ Feature: I2P
When I start the I2P Browser through the GNOME menu
Then the I2P router console is displayed in I2P Browser
- #10497
+ #10497, #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
diff --git a/features/icedove.feature b/features/icedove.feature
index 3d661db..0b36543 100644
--- a/features/icedove.feature
+++ b/features/icedove.feature
@@ -1,3 +1,4 @@
+#10497, #11465
@product @check_tor_leaks @fragile
Feature: Icedove email client
As a Tails user
diff --git a/features/pidgin.feature b/features/pidgin.feature
index f6c2f8b..0de635f 100644
--- a/features/pidgin.feature
+++ b/features/pidgin.feature
@@ -9,7 +9,7 @@ Feature: Chatting anonymously using Pidgin
And all Internet traffic should flow only through Tor
#11453
- @check_tor_leaks
+ @check_tor_leaks @fragile
Scenario: Chatting with some friend over XMPP
Given I have started Tails from DVD and logged in and the network is connected
When I start Pidgin through the GNOME menu