summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-10-16 18:40:24 +0200
committeranonym <anonym@riseup.net>2015-10-16 18:40:24 +0200
commitb25d21c50db43ac0e4a5179a010af5834227b548 (patch)
treed63ebe5c6d58488c19478cf8ae6a066fc3618b15
parent474c75a2f7049f84db5f9ea17755d2de8b3da5cc (diff)
parent8a5d4cef0fea6a23f6ccc93dcac0b9c804fe067a (diff)
Merge branch 'devel' into test/10378-fix-tails-shipped-openpgp-keys-test-is-fragile
-rw-r--r--features/pidgin.feature2
-rw-r--r--features/support/env.rb6
-rw-r--r--features/tor_enforcement.feature1
-rw-r--r--features/tor_stream_isolation.feature3
-rw-r--r--features/torified_browsing.feature12
-rw-r--r--features/unsafe_browser.feature1
m---------submodules/pythonlib0
7 files changed, 18 insertions, 7 deletions
diff --git a/features/pidgin.feature b/features/pidgin.feature
index 512b487..1b55acb 100644
--- a/features/pidgin.feature
+++ b/features/pidgin.feature
@@ -51,7 +51,7 @@ Feature: Chatting anonymously using Pidgin
When I say something to my friend
Then I receive a response from my friend
- @check_tor_leaks
+ @check_tor_leaks @fragile
Scenario: Connecting to the #tails IRC channel with the pre-configured account
Given I have started Tails from DVD and logged in and the network is connected
And Pidgin has the expected accounts configured with random nicknames
diff --git a/features/support/env.rb b/features/support/env.rb
index 685d703..689172e 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -3,6 +3,12 @@ require "#{Dir.pwd}/features/support/extra_hooks.rb"
require 'time'
require 'rspec'
+# Force UTF-8. Ruby will default to the system locale, and if it is
+# non-UTF-8, String-methods will fail when operating on non-ASCII
+# strings.
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
def fatal_system(str)
unless system(str)
raise StandardError.new("Command exited with #{$?}")
diff --git a/features/tor_enforcement.feature b/features/tor_enforcement.feature
index a5b701c..517853c 100644
--- a/features/tor_enforcement.feature
+++ b/features/tor_enforcement.feature
@@ -16,6 +16,7 @@ Feature: The Tor enforcement is effective
And the firewall's NAT rules only redirect traffic for Tor's TransPort and DNSPort
And the firewall is configured to block all IPv6 traffic
+ @fragile
Scenario: Anti test: Detecting IPv4 TCP leaks from the Unsafe Browser with the firewall leak detector
Given I have started Tails from DVD and logged in and the network is connected
And I capture all network traffic
diff --git a/features/tor_stream_isolation.feature b/features/tor_stream_isolation.feature
index 0d38eda..59aa34d 100644
--- a/features/tor_stream_isolation.feature
+++ b/features/tor_stream_isolation.feature
@@ -27,6 +27,7 @@ Feature: Tor stream isolation is effective
And the Tor Browser has started and loaded the startup page
Then I see that Tor Browser is properly stream isolated
+ @fragile
Scenario: Gobby is using the default SocksPort
When I monitor the network connections of Gobby
And I start "Gobby" via the GNOME "Internet" applications menu
@@ -45,12 +46,14 @@ Feature: Tor stream isolation is effective
And the whois command is successful
Then I see that whois is properly stream isolated
+ @fragile
Scenario: Explicitly torify-wrapped applications are using the default SocksPort
When I monitor the network connections of Gobby
And I run "torify /usr/bin/gobby-0.5" in GNOME Terminal
And I connect Gobby to "gobby.debian.org"
Then I see that Gobby is properly stream isolated
+ @fragile
Scenario: Explicitly torsocks-wrapped applications are using the default SocksPort
When I monitor the network connections of Gobby
And I run "torsocks /usr/bin/gobby-0.5" in GNOME Terminal
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index c042d63..84093da 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -1,4 +1,4 @@
-@product
+@product @fragile
Feature: Browsing the web using the Tor Browser
As a Tails user
when I browse the web using the Tor Browser
@@ -25,7 +25,7 @@ Feature: Browsing the web using the Tor Browser
Then I can save the current page as "index.html" to the default downloads directory
And I can print the current page as "output.pdf" to the default downloads directory
- @check_tor_leaks
+ @check_tor_leaks @fragile
Scenario: Importing an OpenPGP key from a website
Given I have started Tails from DVD and logged in and the network is connected
When I start the Tor Browser
@@ -35,7 +35,7 @@ Feature: Browsing the web using the Tor Browser
When I accept to import the key with Seahorse
Then I see "KeyImportedNotification.png" after at most 10 seconds
- @check_tor_leaks
+ @check_tor_leaks @fragile
Scenario: Playing HTML5 audio
Given I have started Tails from DVD and logged in and the network is connected
When I start the Tor Browser
@@ -45,7 +45,7 @@ Feature: Browsing the web using the Tor Browser
And I click the HTML5 play button
And 1 application is playing audio after 10 seconds
- @check_tor_leaks
+ @check_tor_leaks @fragile
Scenario: Watching a WebM video
Given I have started Tails from DVD and logged in and the network is connected
When I start the Tor Browser
@@ -106,7 +106,7 @@ Feature: Browsing the web using the Tor Browser
And the Tor Browser has started
Then the Tor Browser uses all expected TBB shared libraries
- @check_tor_leaks
+ @check_tor_leaks @fragile
Scenario: Opening check.torproject.org in the Tor Browser shows the green onion and the congratulations message
Given I have started Tails from DVD and logged in and the network is connected
When I start the Tor Browser
@@ -114,7 +114,7 @@ Feature: Browsing the web using the Tor Browser
And I open the address "https://check.torproject.org" in the Tor Browser
Then I see "TorBrowserTorCheck.png" after at most 180 seconds
- @check_tor_leaks
+ @check_tor_leaks @fragile
Scenario: The Tor Browser's "New identity" feature works as expected
Given I have started Tails from DVD and logged in and the network is connected
When I start the Tor Browser
diff --git a/features/unsafe_browser.feature b/features/unsafe_browser.feature
index fa85c9e..4015138 100644
--- a/features/unsafe_browser.feature
+++ b/features/unsafe_browser.feature
@@ -36,6 +36,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
+ @fragile
Scenario: Opening check.torproject.org in the Unsafe Browser shows the red onion and a warning message.
Given I have started Tails from DVD and logged in and the network is connected
When I successfully start the Unsafe Browser
diff --git a/submodules/pythonlib b/submodules/pythonlib
-Subproject 4cea598050b217267e1489413aaf1e416abc25e
+Subproject ee7d6a337ba6df1fa32c42766192525b3f37d36