summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-07-17 02:03:14 +0200
committeranonym <anonym@riseup.net>2015-07-17 02:03:14 +0200
commit009c58c2f7bbb5e1bfb7eb916e649246039bf943 (patch)
tree6bfa4062dafaf65f9cd5b49c5c424fd6eb7ead76
parent006c6313110b81e6791b5a0f3f19d91e7d0d5ed5 (diff)
WIP snapshots + chutney
-rw-r--r--features/checks.feature5
-rw-r--r--features/chutney.feature18
-rw-r--r--features/dhcp.feature1
-rw-r--r--features/electrum.feature1
-rw-r--r--features/i2p.feature6
-rw-r--r--features/localization.feature1
-rw-r--r--features/step_definitions/chutney.rb5
-rw-r--r--features/step_definitions/snapshots.rb2
-rw-r--r--features/time_syncing.feature6
-rw-r--r--features/tor_enforcement.feature1
-rw-r--r--features/torified_browsing.feature1
-rw-r--r--features/windows_camouflage.feature1
12 files changed, 27 insertions, 21 deletions
diff --git a/features/checks.feature b/features/checks.feature
index 1dbf7ee..8052af8 100644
--- a/features/checks.feature
+++ b/features/checks.feature
@@ -31,6 +31,7 @@ Feature: Various checks
Scenario: The "Report an Error" launcher will open the support documentation
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
And the network is plugged
And Tor is ready
And all notifications have disappeared
@@ -45,6 +46,7 @@ Feature: Various checks
Scenario: No initial network
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
And I wait between 30 and 60 seconds
When the network is plugged
And Tor is ready
@@ -54,18 +56,21 @@ Feature: Various checks
Scenario: The 'Tor is ready' notification is shown when Tor has bootstrapped
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
And the network is plugged
When I see the 'Tor is ready' notification
Then Tor is ready
Scenario: The tor process should be confined with Seccomp
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
And the network is plugged
And Tor is ready
Then the running process "tor" is confined with Seccomp in filter mode
Scenario: No unexpected network services
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
When the network is plugged
And Tor is ready
Then no unexpected services are listening for network connections
diff --git a/features/chutney.feature b/features/chutney.feature
deleted file mode 100644
index 1695263..0000000
--- a/features/chutney.feature
+++ /dev/null
@@ -1,18 +0,0 @@
-@product
-Feature: Simulate the Tor network with chutney
-
- Background:
- Given a computer
- And I start Tails from DVD with network unplugged and I login
- And Tails is using a simulated Tor network
- And the network is plugged
- And Tor is ready
- And available upgrades have been checked
- And all notifications have disappeared
- And I save the state so the background can be restored next scenario
-
- Scenario: We're not using the real Tor network
- When I start the Tor Browser
- And the Tor Browser has started and loaded the startup page
- And I open the address "https://check.torproject.org" in the Tor Browser
- Then I see "UnsafeBrowserTorCheckFail.png" after at most 30 seconds
diff --git a/features/dhcp.feature b/features/dhcp.feature
index 9dbaa94..1c30aab 100644
--- a/features/dhcp.feature
+++ b/features/dhcp.feature
@@ -7,6 +7,7 @@ Feature: Getting a DHCP lease without leaking too much information
Background:
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
And I capture all network traffic
And the network is plugged
And Tor is ready
diff --git a/features/electrum.feature b/features/electrum.feature
index 8e46506..5aae381 100644
--- a/features/electrum.feature
+++ b/features/electrum.feature
@@ -12,6 +12,7 @@ Feature: Electrum Bitcoin client
Scenario: Using a persistent Electrum configuration
Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
+ And Tails is using a simulated Tor network
And the network is plugged
When I enable persistence
And I log in to a new session
diff --git a/features/i2p.feature b/features/i2p.feature
index 7295a0e..09f6c5c 100644
--- a/features/i2p.feature
+++ b/features/i2p.feature
@@ -5,8 +5,11 @@ Feature: I2P
Scenario: I2P is disabled by default
Given a computer
+ And the network is unplugged
And I start the computer
And the computer boots Tails
+ And Tails is using a simulated Tor network
+ And the network is plugged
And I log in to a new session
And the Tails desktop is ready
And Tor is ready
@@ -17,9 +20,12 @@ Feature: I2P
Scenario: I2P is enabled when the "i2p" boot parameter is added
Given a computer
+ And the network is unplugged
And I set Tails to boot with options "i2p"
And I start the computer
And the computer boots Tails
+ And Tails is using a simulated Tor network
+ And the network is plugged
And I log in to a new session
And the Tails desktop is ready
And Tor is ready
diff --git a/features/localization.feature b/features/localization.feature
index ef59361..c52e8fa 100644
--- a/features/localization.feature
+++ b/features/localization.feature
@@ -6,6 +6,7 @@ Feature: Localization
Scenario: The Report an Error launcher will open the support documentation in supported non-English locales
Given Tails has booted from DVD without network and stopped at Tails Greeter's login screen
+ And Tails is using a simulated Tor network
And the network is plugged
And I log in to a new session in German
And Tails seems to have booted normally
diff --git a/features/step_definitions/chutney.rb b/features/step_definitions/chutney.rb
index 14be394..c1feaa2 100644
--- a/features/step_definitions/chutney.rb
+++ b/features/step_definitions/chutney.rb
@@ -1,6 +1,5 @@
When /^Tails is using a simulated Tor network$/ do
- next if @skip_steps_while_restoring_background
- assert(not(@vm.execute('service tor status').success?),
+ assert(not($vm.execute('service tor status').success?),
"Running this step when Tor is running is probably not intentional")
# Ensure that a fresh chutney instnace is running, and that it will
@@ -59,6 +58,6 @@ When /^Tails is using a simulated Tor network$/ do
end
client_torrc_lines.concat(dir_auth_lines)
client_torrc_lines.each do |line|
- @vm.file_append('/etc/tor/torrc', line)
+ $vm.file_append('/etc/tor/torrc', line)
end
end
diff --git a/features/step_definitions/snapshots.rb b/features/step_definitions/snapshots.rb
index ad7a7e8..1ea250d 100644
--- a/features/step_definitions/snapshots.rb
+++ b/features/step_definitions/snapshots.rb
@@ -24,6 +24,7 @@ def checkpoints
:description => "Tails has booted from DVD and logged in and the network is connected",
:parent_checkpoint => "no-network-logged-in",
:steps => [
+ 'Tails is using a simulated Tor network',
'the network is plugged',
'Tor is ready',
'all notifications have disappeared',
@@ -47,6 +48,7 @@ def checkpoints
:description => "Tails has booted from DVD and logged in with an administration password and the network is connected",
:parent_checkpoint => "no-network-logged-in-sudo-passwd",
:steps => [
+ 'Tails is using a simulated Tor network',
'the network is plugged',
'Tor is ready',
'all notifications have disappeared',
diff --git a/features/time_syncing.feature b/features/time_syncing.feature
index 64f173d..362554a 100644
--- a/features/time_syncing.feature
+++ b/features/time_syncing.feature
@@ -6,12 +6,14 @@ Feature: Time syncing
Scenario: Clock with host's time
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
When the network is plugged
And Tor is ready
Then Tails clock is less than 5 minutes incorrect
Scenario: Clock is one day in the past
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
When I bump the system time with "-1 day"
And the network is plugged
And Tor is ready
@@ -19,6 +21,7 @@ Feature: Time syncing
Scenario: Clock is one day in the future
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
When I bump the system time with "+1 day"
And the network is plugged
And Tor is ready
@@ -26,6 +29,7 @@ Feature: Time syncing
Scenario: Clock way in the future
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
When I set the system time to "01 Jan 2020 12:34:56"
And the network is plugged
And Tor is ready
@@ -33,6 +37,7 @@ Feature: Time syncing
Scenario: The system time is not synced to the hardware clock
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
When I bump the system time with "-15 days"
And I warm reboot the computer
And the computer reboots Tails
@@ -40,6 +45,7 @@ Feature: Time syncing
Scenario: Anti-test: Changes to the hardware clock are kept when rebooting
Given Tails has booted from DVD without network and logged in
+ And Tails is using a simulated Tor network
When I bump the hardware clock's time with "-15 days"
And I warm reboot the computer
And the computer reboots Tails
diff --git a/features/tor_enforcement.feature b/features/tor_enforcement.feature
index b61a7d0..1166197 100644
--- a/features/tor_enforcement.feature
+++ b/features/tor_enforcement.feature
@@ -65,6 +65,7 @@ Feature: The Tor enforcement is effective
And the network is unplugged
And I start the computer
And the computer boots Tails
+ And Tails is using a simulated Tor network
And I log in to a new session
And the Tails desktop is ready
And the system DNS is using the local DNS resolver
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index 8745ae4..3bd7391 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -109,6 +109,7 @@ Feature: Browsing the web using the Tor Browser
Scenario: The persistent Tor Browser directory is usable
Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
+ And Tails is using a simulated Tor network
And the network is plugged
When I enable persistence
And I log in to a new session
diff --git a/features/windows_camouflage.feature b/features/windows_camouflage.feature
index 4805d83..3cdd4b7 100644
--- a/features/windows_camouflage.feature
+++ b/features/windows_camouflage.feature
@@ -20,6 +20,7 @@ Feature: Microsoft Windows Camouflage
And I see "WindowsSysTraySound.png" after at most 10 seconds
Scenario: Windows should appear like those in Microsoft Windows
+ Given Tails is using a simulated Tor network
When the network is plugged
And Tor is ready
And all notifications have disappeared