summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-07-23 13:04:23 +0000
committerintrigeri <intrigeri@boum.org>2016-07-23 13:04:23 +0000
commit1ce705f610c11ba09d75922870a5f180e471823f (patch)
tree2b70758065240d2eb05255822f2d1f7b83e2d8d7
parenta7fcc39d3d59a0d628dda95fd1da091c402421d6 (diff)
parentc2a2f546555dcefc67253beba4228bda44c1ff72 (diff)
Merge remote-tracking branch 'origin/stable' into test/10971-more-CPUs-for-TailsToaster
-rwxr-xr-xconfig/chroot_local-hooks/54-menu4
-rw-r--r--config/chroot_local-includes/etc/default/htpdate.pools4
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/htpdate1
-rw-r--r--config/chroot_local-patches/wrap_pidgin.patch11
-rw-r--r--features/apt.feature3
-rw-r--r--features/config/defaults.yml2
-rw-r--r--features/i2p.feature10
-rw-r--r--features/images/GitCloneDone.pngbin0 -> 2974 bytes
-rw-r--r--features/images/GnomeCloseTopButton.pngbin0 -> 399 bytes
-rw-r--r--features/images/SSHError.pngbin0 -> 635 bytes
-rw-r--r--features/pidgin.feature1
-rw-r--r--features/ssh.feature5
-rw-r--r--features/step_definitions/apt.rb26
-rw-r--r--features/step_definitions/git.rb24
-rw-r--r--features/step_definitions/ssh.rb38
-rw-r--r--features/step_definitions/usb.rb6
-rw-r--r--features/time_syncing.feature2
-rw-r--r--features/tor_stream_isolation.feature2
-rw-r--r--features/torified_browsing.feature16
-rw-r--r--features/torified_git.feature20
-rw-r--r--features/usb_install.feature1
21 files changed, 120 insertions, 56 deletions
diff --git a/config/chroot_local-hooks/54-menu b/config/chroot_local-hooks/54-menu
index 0449c21..97d17c1 100755
--- a/config/chroot_local-hooks/54-menu
+++ b/config/chroot_local-hooks/54-menu
@@ -11,8 +11,12 @@ for app in tails-installer-launcher tails-persistence-delete tails-persistence-s
done
rm \
+ /usr/share/applications/gnome-online-accounts-panel.desktop \
/usr/share/applications/laptop-mode-tools.desktop \
/usr/share/applications/sniff.desktop \
/usr/share/applications/system-config-printer.desktop
+sed -i'' --regexp-extended 's,^Exec=pidgin$,Exec=/usr/local/bin/pidgin,' \
+ /usr/share/applications/pidgin.desktop
+
xdg-desktop-menu forceupdate
diff --git a/config/chroot_local-includes/etc/default/htpdate.pools b/config/chroot_local-includes/etc/default/htpdate.pools
index 68b79b4..e91d876 100644
--- a/config/chroot_local-includes/etc/default/htpdate.pools
+++ b/config/chroot_local-includes/etc/default/htpdate.pools
@@ -1,3 +1,3 @@
-HTP_POOL_PAL="boum.org,chavez.indymedia.org,db.debian.org,epic.org,mail.riseup.net,sarava.org,squat.net,tachanka.org,www.1984.is,www.eff.org,www.immerda.ch,www.privacyinternational.org,www.torproject.org"
+HTP_POOL_PAL="boum.org,espiv.net,db.debian.org,epic.org,mail.riseup.net,www.sarava.org,squat.net,tachanka.org,www.1984.is,www.eff.org,www.immerda.ch,www.privacyinternational.org,www.torproject.org"
HTP_POOL_NEUTRAL="cve.mitre.org,en.wikipedia.org,lkml.org,thepiratebay.org,www.apache.org,www.centos.org,www.democracynow.org,www.duckduckgo.com,www.gnu.org,www.kernel.org,www.mozilla.org,www.stackexchange.com,www.startpage.com,www.xkcd.com"
-HTP_POOL_FOE="encrypted.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,www.myspace.com,www.paypal.com,www.rsa.com,www.sony.com"
+HTP_POOL_FOE="encrypted.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,www.myspace.com,www.paypal.com,www.rackspace.com,www.sony.com"
diff --git a/config/chroot_local-includes/usr/local/sbin/htpdate b/config/chroot_local-includes/usr/local/sbin/htpdate
index 41f2b2f..454ba8b 100755
--- a/config/chroot_local-includes/usr/local/sbin/htpdate
+++ b/config/chroot_local-includes/usr/local/sbin/htpdate
@@ -223,6 +223,7 @@ sub getUrlDateDiff {
my @curl_options = (
'--user-agent', $useragent, '--silent',
'--proto', '=https', '--tlsv1',
+ '--max-time', '30',
'--head', '--output', catfile($tmpdir, 'headers'),
);
push @curl_options, ('--socks5-hostname', $proxy) if defined $proxy;
diff --git a/config/chroot_local-patches/wrap_pidgin.patch b/config/chroot_local-patches/wrap_pidgin.patch
deleted file mode 100644
index c4b800e..0000000
--- a/config/chroot_local-patches/wrap_pidgin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usr/share/applications/pidgin.desktop 2014-11-14 11:07:14.000000000 +0000
-+++ b/usr/share/applications/pidgin.desktop 2014-11-26 17:13:35.000000000 +0000
-@@ -183,7 +183,7 @@
- Comment[zh_CN]=互联网通讯程序。 支持 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 和更多
- Comment[zh_HK]=讓你可以透過即時通訊與好友聊天,支援 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 等等
- Comment[zh_TW]=讓您可以透過即時通訊與好友聊天,支援 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 等等
--Exec=pidgin
-+Exec=/usr/local/bin/pidgin
- Icon=pidgin
- StartupNotify=true
- Terminal=false
diff --git a/features/apt.feature b/features/apt.feature
index b0ece1f..02a122c 100644
--- a/features/apt.feature
+++ b/features/apt.feature
@@ -11,8 +11,7 @@ Feature: Installing packages through APT
Scenario: APT sources are configured correctly
Then the only hosts in APT sources are "ftp.us.debian.org,security.debian.org,deb.tails.boum.org,deb.torproject.org"
- #10496: apt-get scenarios are fragile
- @check_tor_leaks @fragile
+ @check_tor_leaks
Scenario: Install packages using apt
When I update APT using apt
Then I should be able to install a package using apt
diff --git a/features/config/defaults.yml b/features/config/defaults.yml
index bd2f130..993dfe3 100644
--- a/features/config/defaults.yml
+++ b/features/config/defaults.yml
@@ -33,4 +33,4 @@ Unsafe_SSH_private_key: |
NWema+bArbaF0rKVJpwvpkZWGcr6qRn94Ts0kJAzR+VIVTOjB9sVwdxjadwWHRs5
kKnpY0tnSF7hyVRwN7GOsNDJEaFjCW7k4+55D2ZNBy2iN3beW8CZ
-----END RSA PRIVATE KEY-----
-Unsafe_SSH_public_key: = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8xQ2BRQz+TK6jbqb5fDuKAbrOAYUwVtLe7yblK0awk6fvMuInw/kyaX9H7i105LqjBVThFplM+w1lkr8KViY4+GY28nTilUKGTYNnwABGD9MA2PeqMqzcP4x4puTVu3oSwDnmSAaxNSTLlOLxxzZadrbmOqNqAiLIzzbY8Yb2aYjr/MthHpAtSLM1pyJetEzdDhHixCQSt5WUd6ic8SIZSz3PHSzAKku08zlQhi17U9UeCTB4+xTq8zxSpVMr9XC0suAtqdeewwW7OrsNMBc+rj35dIU2rgmXFsQXr49Bdm9hnk15bTQars1Kk8/y6gevp/Un6YzHGczzmPNi1HH5 amnesia@amnesia"
+Unsafe_SSH_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8xQ2BRQz+TK6jbqb5fDuKAbrOAYUwVtLe7yblK0awk6fvMuInw/kyaX9H7i105LqjBVThFplM+w1lkr8KViY4+GY28nTilUKGTYNnwABGD9MA2PeqMqzcP4x4puTVu3oSwDnmSAaxNSTLlOLxxzZadrbmOqNqAiLIzzbY8Yb2aYjr/MthHpAtSLM1pyJetEzdDhHixCQSt5WUd6ic8SIZSz3PHSzAKku08zlQhi17U9UeCTB4+xTq8zxSpVMr9XC0suAtqdeewwW7OrsNMBc+rj35dIU2rgmXFsQXr49Bdm9hnk15bTQars1Kk8/y6gevp/Un6YzHGczzmPNi1HH5 amnesia@amnesia"
diff --git a/features/i2p.feature b/features/i2p.feature
index 616c5ff..c2d8b7c 100644
--- a/features/i2p.feature
+++ b/features/i2p.feature
@@ -15,11 +15,15 @@ Feature: I2P
And the I2P Browser sudo rules are present
And the I2P firewall rules are enabled
+ #11114
+ @fragile
Scenario: I2P's AppArmor profile is in enforce mode
Given I have started Tails from DVD with I2P enabled and logged in and the network is connected
When I2P is running
Then the running process "i2p" is confined with AppArmor in enforce mode
+ #11114
+ @fragile
Scenario: The I2P Browser works as it should
Given I have started Tails from DVD with I2P enabled and logged in and the network is connected
And the I2P router console is ready
@@ -27,7 +31,7 @@ Feature: I2P
Then the I2P router console is displayed in I2P Browser
And the I2P Browser uses all expected TBB shared libraries
- #11457, #11458
+ #11114, #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
@@ -48,6 +52,8 @@ Feature: I2P
When I open the address "http://i2p-projekt.i2p" in the I2P Browser
Then the I2P homepage loads in I2P Browser
+ #11114
+ @fragile
Scenario: I2P is configured to run in Hidden mode
Given I have started Tails from DVD with I2P enabled and logged in and the network is connected
And the I2P router console is ready
@@ -55,7 +61,7 @@ Feature: I2P
Then the I2P router console is displayed in I2P Browser
And I2P is running in hidden mode
- #10474
+ #10474, #11114
@fragile
Scenario: Connecting to the #i2p IRC channel with the pre-configured account
Given I have started Tails from DVD with I2P enabled and logged in and the network is connected
diff --git a/features/images/GitCloneDone.png b/features/images/GitCloneDone.png
new file mode 100644
index 0000000..f81dd59
--- /dev/null
+++ b/features/images/GitCloneDone.png
Binary files differ
diff --git a/features/images/GnomeCloseTopButton.png b/features/images/GnomeCloseTopButton.png
new file mode 100644
index 0000000..b5a2f7f
--- /dev/null
+++ b/features/images/GnomeCloseTopButton.png
Binary files differ
diff --git a/features/images/SSHError.png b/features/images/SSHError.png
new file mode 100644
index 0000000..b2cec40
--- /dev/null
+++ b/features/images/SSHError.png
Binary files differ
diff --git a/features/pidgin.feature b/features/pidgin.feature
index aabe9b7..2858482 100644
--- a/features/pidgin.feature
+++ b/features/pidgin.feature
@@ -92,6 +92,7 @@ Feature: Chatting anonymously using Pidgin
Then I cannot add a certificate from the "/live/overlay/home/amnesia/.gnupg" directory to Pidgin
#10720: Tails Installer freezes on Jenkins
+ #11584
@check_tor_leaks @fragile
Scenario: Using a persistent Pidgin configuration
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
diff --git a/features/ssh.feature b/features/ssh.feature
index 0e64e86..695f1b6 100644
--- a/features/ssh.feature
+++ b/features/ssh.feature
@@ -1,5 +1,4 @@
-#10498: SSH tests are fragile
-@product @fragile
+@product
Feature: Logging in via SSH
As a Tails user
When I connect to SSH servers on the Internet
@@ -12,7 +11,6 @@ Feature: Logging in via SSH
Scenario: Connecting to an SSH server on the Internet
Given I have the SSH key pair for an SSH server
When I connect to an SSH server on the Internet
- And I verify the SSH fingerprint for the SSH server
Then I have sucessfully logged into the SSH server
@check_tor_leaks
@@ -26,5 +24,4 @@ Feature: Logging in via SSH
Scenario: Connecting to an SFTP server on the Internet using the GNOME "Connect to Server" feature
Given I have the SSH key pair for an SFTP server
When I connect to an SFTP server on the Internet
- And I verify the SSH fingerprint for the SFTP server
Then I successfully connect to the SFTP server
diff --git a/features/step_definitions/apt.rb b/features/step_definitions/apt.rb
index 8756803..f96795a 100644
--- a/features/step_definitions/apt.rb
+++ b/features/step_definitions/apt.rb
@@ -12,18 +12,30 @@ Given /^the only hosts in APT sources are "([^"]*)"$/ do |hosts_str|
end
When /^I update APT using apt$/ do
- Timeout::timeout(30*60) do
- $vm.execute_successfully("echo #{@sudo_password} | " +
- "sudo -S apt update", :user => LIVE_USER)
+ recovery_proc = Proc.new do
+ step 'I kill the process "apt"'
+ $vm.execute('rm -rf /var/lib/apt/lists/*')
+ end
+ retry_tor(recovery_proc) do
+ Timeout::timeout(15*60) do
+ $vm.execute_successfully("echo #{@sudo_password} | " +
+ "sudo -S apt update", :user => LIVE_USER)
+ end
end
end
Then /^I should be able to install a package using apt$/ do
package = "cowsay"
- Timeout::timeout(120) do
- $vm.execute_successfully("echo #{@sudo_password} | " +
- "sudo -S apt install #{package}",
- :user => LIVE_USER)
+ recovery_proc = Proc.new do
+ step 'I kill the process "apt"'
+ $vm.execute("apt purge #{package}")
+ end
+ retry_tor(recovery_proc) do
+ Timeout::timeout(2*60) do
+ $vm.execute_successfully("echo #{@sudo_password} | " +
+ "sudo -S apt install #{package}",
+ :user => LIVE_USER)
+ end
end
step "package \"#{package}\" is installed"
end
diff --git a/features/step_definitions/git.rb b/features/step_definitions/git.rb
index bf6f869..579c5c7 100644
--- a/features/step_definitions/git.rb
+++ b/features/step_definitions/git.rb
@@ -1,3 +1,27 @@
+When /^I clone the Git repository "([\S]+)" in GNOME Terminal$/ do |repo|
+ repo_directory = /[\S]+\/([\S]+)(\.git)?$/.match(repo)[1]
+ assert(!$vm.directory_exist?("/home/#{LIVE_USER}/#{repo_directory}"))
+
+ recovery_proc = Proc.new do
+ $vm.execute("rm -rf /home/#{LIVE_USER}/#{repo_directory}",
+ :user => LIVE_USER)
+ step 'I kill the process "git"'
+ @screen.type('clear' + Sikuli::Key.ENTER)
+ end
+
+ retry_tor(recovery_proc) do
+ step "I run \"git clone #{repo}\" in GNOME Terminal"
+ m = /^(https?|git):\/\//.match(repo)
+ unless m
+ step 'I verify the SSH fingerprint for the Git repository'
+ end
+ try_for(180, :msg => 'Git process took too long') {
+ !$vm.has_process?('/usr/bin/git')
+ }
+ @screen.wait('GitCloneDone.png', 10)
+ end
+end
+
Then /^the Git repository "([\S]+)" has been cloned successfully$/ do |repo|
assert($vm.directory_exist?("/home/#{LIVE_USER}/#{repo}/.git"))
assert($vm.file_exist?("/home/#{LIVE_USER}/#{repo}/.git/config"))
diff --git a/features/step_definitions/ssh.rb b/features/step_definitions/ssh.rb
index 64c6841..e998101 100644
--- a/features/step_definitions/ssh.rb
+++ b/features/step_definitions/ssh.rb
@@ -60,6 +60,7 @@ end
Given /^I (?:am prompted to )?verify the SSH fingerprint for the (?:Git|SSH) (?:repository|server)$/ do
@screen.wait("SSHFingerprint.png", 60)
+ sleep 1 # brief pause to ensure that the following keystrokes do not get lost
@screen.type('yes' + Sikuli::Key.ENTER)
end
@@ -95,8 +96,17 @@ When /^I connect to an SSH server on the (Internet|LAN)$/ do |location|
cmd = "ssh #{@ssh_username}@#{@ssh_host} #{ssh_port_suffix}"
step 'process "ssh" is not running'
- step "I run \"#{cmd}\" in GNOME Terminal"
- step 'process "ssh" is running within 10 seconds'
+
+ recovery_proc = Proc.new do
+ step 'I kill the process "ssh"' if $vm.has_process?("ssh")
+ step 'I run "clear" in GNOME Terminal'
+ end
+
+ retry_tor(recovery_proc) do
+ step "I run \"#{cmd}\" in GNOME Terminal"
+ step 'process "ssh" is running within 10 seconds'
+ step 'I verify the SSH fingerprint for the SSH server'
+ end
end
Then /^I have sucessfully logged into the SSH server$/ do
@@ -105,17 +115,29 @@ end
Then /^I connect to an SFTP server on the Internet$/ do
read_and_validate_ssh_config "SFTP"
+
@sftp_port ||= 22
@sftp_port = @sftp_port.to_s
- step 'I start "Files" via the GNOME "Accessories" applications menu'
- @screen.wait_and_click("GnomeFilesConnectToServer.png", 10)
- @screen.wait("GnomeConnectToServerWindow.png", 10)
- @screen.type("sftp://" + @sftp_username + "@" + @sftp_host + ":" + @sftp_port)
- @screen.wait_and_click("GnomeConnectToServerConnectButton.png", 10)
+
+ recovery_proc = Proc.new do
+ step 'I kill the process "ssh"'
+ @screen.type(Sikuli::Key.ESC)
+ @screen.click("GnomeCloseTopButton.png")
+ @screen.waitVanish("GnomeCloseTopButton.png", 10)
+ end
+
+ retry_tor(recovery_proc) do
+ step 'I start "Files" via the GNOME "Accessories" applications menu'
+ @screen.wait_and_click("GnomeFilesConnectToServer.png", 10)
+ @screen.wait("GnomeConnectToServerWindow.png", 10)
+ @screen.type("sftp://" + @sftp_username + "@" + @sftp_host + ":" + @sftp_port)
+ @screen.wait_and_click("GnomeConnectToServerConnectButton.png", 10)
+ step "I verify the SSH fingerprint for the SFTP server"
+ end
end
Then /^I verify the SSH fingerprint for the SFTP server$/ do
- @screen.wait_and_click("GnomeSSHVerificationConfirm.png", 60)
+ @screen.wait_and_click("GnomeSSHVerificationConfirm.png", 2*60)
end
Then /^I successfully connect to the SFTP server$/ do
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index a1d333a..03815b4 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -283,10 +283,10 @@ Then /^a Tails persistence partition exists on USB drive "([^"]+)"$/ do |name|
# The LUKS container may already be opened, e.g. by udisks after
# we've run tails-persistence-setup.
- c = $vm.execute("ls -1 /dev/mapper/")
+ c = $vm.execute("ls -1 --hide 'control' /dev/mapper/")
if c.success?
for candidate in c.stdout.split("\n")
- luks_info = $vm.execute("cryptsetup status #{candidate}")
+ luks_info = $vm.execute("cryptsetup status '#{candidate}'")
if luks_info.success? and luks_info.stdout.match("^\s+device:\s+#{dev}$")
luks_dev = "/dev/mapper/#{candidate}"
break
@@ -309,7 +309,7 @@ Then /^a Tails persistence partition exists on USB drive "([^"]+)"$/ do |name|
mount_dir = "/mnt/#{name}"
$vm.execute("mkdir -p #{mount_dir}")
- c = $vm.execute("mount #{luks_dev} #{mount_dir}")
+ c = $vm.execute("mount '#{luks_dev}' #{mount_dir}")
assert(c.success?,
"Couldn't mount opened LUKS device '#{dev}' on drive '#{name}'")
diff --git a/features/time_syncing.feature b/features/time_syncing.feature
index cda75f6..cd835bc 100644
--- a/features/time_syncing.feature
+++ b/features/time_syncing.feature
@@ -10,6 +10,8 @@ Feature: Time syncing
And Tor is ready
Then Tails clock is less than 5 minutes incorrect
+ #11589
+ @fragile
Scenario: Clock with host's time in bridge mode
Given I have started Tails from DVD without network and logged in with bridge mode enabled
When the network is plugged
diff --git a/features/tor_stream_isolation.feature b/features/tor_stream_isolation.feature
index 59aa34d..129707e 100644
--- a/features/tor_stream_isolation.feature
+++ b/features/tor_stream_isolation.feature
@@ -21,6 +21,8 @@ Feature: Tor stream isolation is effective
And I re-run tails-upgrade-frontend-wrapper
Then I see that tails-upgrade-frontend-wrapper is properly stream isolated
+ #11592
+ @fragile
Scenario: The Tor Browser is using the web browser-specific SocksPort
When I monitor the network connections of Tor Browser
And I start the Tor Browser
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index 222e350..8d73324 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -4,6 +4,8 @@ Feature: Browsing the web using the Tor Browser
when I browse the web using the Tor Browser
all Internet traffic should flow only through Tor
+ #11591, #11592
+ @fragile
Scenario: The Tor Browser cannot access the LAN
Given I have started Tails from DVD and logged in and the network is connected
And a web server is running on the LAN
@@ -14,7 +16,8 @@ Feature: Browsing the web using the Tor Browser
Then the Tor Browser shows the "Unable to connect" error
And no traffic was sent to the web server on the LAN
- @check_tor_leaks
+ #11592
+ @check_tor_leaks @fragile
Scenario: The Tor Browser directory is usable
Given I have started Tails from DVD and logged in and the network is connected
Then the amnesiac Tor Browser directory exists
@@ -25,6 +28,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
+ #11592
@check_tor_leaks @fragile
Scenario: Downloading files with the Tor Browser
Given I have started Tails from DVD and logged in and the network is connected
@@ -35,6 +39,7 @@ Feature: Browsing the web using the Tor Browser
When I save the file to the default Tor Browser download directory
Then the file is saved to the default Tor Browser download directory
+ #11592
@check_tor_leaks @fragile
Scenario: Playing HTML5 audio
Given I have started Tails from DVD and logged in and the network is connected
@@ -56,6 +61,8 @@ Feature: Browsing the web using the Tor Browser
And I accept to temporarily allow playing this video
Then I see "TorBrowserSampleRemoteWebMVideoFrame.png" after at most 180 seconds
+ #11592
+ @fragile
Scenario: I can view a file stored in "~/Tor Browser" but not in ~/.gnupg
Given I have started Tails from DVD and logged in and the network is connected
And I copy "/usr/share/synaptic/html/index.html" to "/home/amnesia/Tor Browser/synaptic.html" as user "amnesia"
@@ -107,6 +114,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
+ #11592
@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
@@ -118,13 +126,15 @@ Feature: Browsing the web using the Tor Browser
And I acknowledge Torbutton's New Identity confirmation prompt
Then the Tor Browser loads the startup page
+ #11592
+ @fragile
Scenario: The Tor Browser should not have any plugins enabled
Given I have started Tails from DVD and logged in and the network is connected
When I start the Tor Browser
And the Tor Browser has started and loaded the startup page
Then the Tor Browser has no plugins installed
- #10720
+ #10720, #11592
@fragile
Scenario: The persistent Tor Browser directory is usable
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
@@ -141,7 +151,7 @@ Feature: Browsing the web using the Tor Browser
Then I see "TorBrowserSavedStartupPage.png" after at most 10 seconds
And I can print the current page as "output.pdf" to the persistent Tor Browser directory
- #10720
+ #10720, #11585
@fragile
Scenario: Persistent browser bookmarks
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
diff --git a/features/torified_git.feature b/features/torified_git.feature
index 64f93a6..cbb3963 100644
--- a/features/torified_git.feature
+++ b/features/torified_git.feature
@@ -1,4 +1,4 @@
-@product @check_tor_leaks @fragile
+@product @check_tor_leaks
Feature: Cloning a Git repository
As a Tails user
when I clone a Git repository
@@ -7,23 +7,17 @@ Feature: Cloning a Git repository
Background:
Given I have started Tails from DVD and logged in and the network is connected
+ #11563
@fragile
Scenario: Cloning a Git repository anonymously over HTTPS
- When I run "git clone https://git-tails.immerda.ch/myprivatekeyispublic/testing" in GNOME Terminal
- Then process "git" is running within 10 seconds
- And process "git" has stopped running after at most 180 seconds
- And the Git repository "testing" has been cloned successfully
+ When I clone the Git repository "https://git-tails.immerda.ch/myprivatekeyispublic/testing" in GNOME Terminal
+ Then the Git repository "testing" has been cloned successfully
Scenario: Cloning a Git repository anonymously over the Git protocol
- When I run "git clone git://git.tails.boum.org/myprivatekeyispublic/testing" in GNOME Terminal
- Then process "git" is running within 10 seconds
- And process "git" has stopped running after at most 180 seconds
- And the Git repository "testing" has been cloned successfully
+ When I clone the Git repository "git://git.tails.boum.org/myprivatekeyispublic/testing" in GNOME Terminal
+ Then the Git repository "testing" has been cloned successfully
Scenario: Cloning git repository over SSH
Given I have the SSH key pair for a Git repository
- When I run "git clone tails@git.tails.boum.org:myprivatekeyispublic/testing" in GNOME Terminal
- Then process "git" is running within 10 seconds
- When I verify the SSH fingerprint for the Git repository
- And process "git" has stopped running after at most 180 seconds
+ When I clone the Git repository "tails@git.tails.boum.org:myprivatekeyispublic/testing" in GNOME Terminal
Then the Git repository "testing" has been cloned successfully
diff --git a/features/usb_install.feature b/features/usb_install.feature
index e8ce2fe..166386d 100644
--- a/features/usb_install.feature
+++ b/features/usb_install.feature
@@ -55,6 +55,7 @@ Feature: Installing Tails to a USB drive
And there is no persistence partition on USB drive "__internal"
#10720: Tails Installer freezes on Jenkins
+ #11583
@fragile
Scenario: Booting Tails from a USB drive in UEFI mode
Given I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen