summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2016-06-02 13:05:53 +0000
committersajolida <sajolida@pimienta.org>2016-06-02 13:05:53 +0000
commit9121667e1a5161c0a6ab5960e64676c8c1b9d207 (patch)
tree2a4771aeb5fc5d7f374a555ebed27e165190a1d8
parent09ff3a4e625dcce81f697c6ae7737140befc3883 (diff)
parent52f27ea3f67c6b1b0342fd2b7bc10f6d9d2c66de (diff)
Merge remote-tracking branch 'origin/testing' into web/11369-2.4-release-notes
-rw-r--r--config/chroot_apt/preferences5
-rwxr-xr-xconfig/chroot_local-hooks/09-torsocks-apps4
-rwxr-xr-xconfig/chroot_local-hooks/54-menu5
-rwxr-xr-xconfig/chroot_local-hooks/57-disable-system-config-printer-applet8
-rw-r--r--config/chroot_local-packageslists/tails-common.list2
-rw-r--r--features/checks.feature7
-rw-r--r--features/dhcp.feature2
-rw-r--r--features/electrum.feature8
-rw-r--r--features/encryption.feature3
-rw-r--r--features/evince.feature2
-rw-r--r--features/i2p.feature16
-rw-r--r--features/icedove.feature2
-rw-r--r--features/localization.feature3
-rw-r--r--features/mac_spoofing.feature2
-rw-r--r--features/persistence.feature4
-rw-r--r--features/pidgin.feature4
-rw-r--r--features/root_access_control.feature2
-rw-r--r--features/ssh.feature1
-rw-r--r--features/step_definitions/common_steps.rb37
-rw-r--r--features/time_syncing.feature4
-rw-r--r--features/tor_bridges.feature2
-rw-r--r--features/tor_enforcement.feature3
-rw-r--r--features/tor_stream_isolation.feature3
-rw-r--r--features/torified_browsing.feature6
-rw-r--r--features/torified_git.feature2
-rw-r--r--features/torified_gnupg.feature2
-rw-r--r--features/torified_misc.feature2
-rw-r--r--features/totem.feature1
-rw-r--r--features/unsafe_browser.feature12
-rw-r--r--features/untrusted_partitions.feature1
-rw-r--r--features/usb_install.feature4
-rw-r--r--features/usb_upgrade.feature1
-rwxr-xr-ximport-translations30
33 files changed, 99 insertions, 91 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index b48fb5f..411b2aa 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -82,6 +82,11 @@ Package: grub2-common
Pin: origin deb.tails.boum.org
Pin-Priority: 999
+Explanation: src:hplip
+Package: hplip* hpijs-ppds libhpmud* libsane-hpaio printer-driver-hpcups printer-driver-hpijs printer-driver-postscript-hp
+Pin: release o=Debian,n=jessie-backports
+Pin-Priority: 999
+
Package: libdvd-pkg
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
diff --git a/config/chroot_local-hooks/09-torsocks-apps b/config/chroot_local-hooks/09-torsocks-apps
index de62521..4ff58c0 100755
--- a/config/chroot_local-hooks/09-torsocks-apps
+++ b/config/chroot_local-hooks/09-torsocks-apps
@@ -5,7 +5,7 @@ set -e
echo "Wrapping some applications with torsocks"
APPS="gobby-0.5 liferea seahorse"
-DBUS_SERVICES="org.gnome.seahorse.Application"
+DBUS_SERVICES="org.gnome.seahorse.Application org.fedoraproject.Config.Printing"
for app in $APPS; do
sed -i'' --regexp-extended 's,^Exec=(.*),Exec=torsocks \1,' \
@@ -13,7 +13,7 @@ for app in $APPS; do
done
for dbus_service in $DBUS_SERVICES; do
- sed -i'' --regexp-extended 's,^Exec=(.*),Exec=torsocks \1,' \
+ sed -i'' --regexp-extended 's,^Exec=(.*),Exec=/usr/bin/torsocks \1,' \
"/usr/share/dbus-1/services/${dbus_service}.service"
done
diff --git a/config/chroot_local-hooks/54-menu b/config/chroot_local-hooks/54-menu
index 0a68e3e..0449c21 100755
--- a/config/chroot_local-hooks/54-menu
+++ b/config/chroot_local-hooks/54-menu
@@ -10,6 +10,9 @@ for app in tails-installer-launcher tails-persistence-delete tails-persistence-s
"/usr/share/applications/${app}.desktop"
done
-rm /usr/share/applications/laptop-mode-tools.desktop
+rm \
+ /usr/share/applications/laptop-mode-tools.desktop \
+ /usr/share/applications/sniff.desktop \
+ /usr/share/applications/system-config-printer.desktop
xdg-desktop-menu forceupdate
diff --git a/config/chroot_local-hooks/57-disable-system-config-printer-applet b/config/chroot_local-hooks/57-disable-system-config-printer-applet
new file mode 100755
index 0000000..c8e69ba
--- /dev/null
+++ b/config/chroot_local-hooks/57-disable-system-config-printer-applet
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+echo "Disabling system-config-printer applet"
+
+echo "X-GNOME-Autostart-enabled=false" \
+ >> /etc/xdg/autostart/print-applet.desktop
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 33f315f..b578ed5 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -215,6 +215,7 @@ syslinux-common
syslinux-efi
# ships isohybrid in syslinux 6.x packaging
syslinux-utils
+system-config-printer
synaptic
torsocks
totem-plugins
@@ -363,6 +364,7 @@ hplip
printer-driver-escpr
printer-driver-hpcups
printer-driver-gutenprint
+printer-driver-postscript-hp
### Make the MAT more powerful
gir1.2-poppler-0.18
diff --git a/features/checks.feature b/features/checks.feature
index 3bbe2f4..bbda069 100644
--- a/features/checks.feature
+++ b/features/checks.feature
@@ -25,7 +25,7 @@ Feature: Various checks
Given I have started Tails from DVD without network and logged in
Then the shipped Debian repository key will be valid for the next 3 months
- @doc @fragile
+ @doc
Scenario: The "Report an Error" launcher will open the support documentation
Given I have started Tails from DVD without network and logged in
And the network is plugged
@@ -40,7 +40,6 @@ Feature: Various checks
And the live user is a member of only its own group and "audio cdrom dialout floppy video plugdev netdev scanner lp lpadmin vboxsf"
And the live user owns its home dir and it has normal permissions
- @fragile
Scenario: No initial network
Given I have started Tails from DVD without network and logged in
And I wait between 30 and 60 seconds
@@ -51,7 +50,7 @@ Feature: Various checks
And all notifications have disappeared
And the time has synced
- #10497, #11463
+ #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
@@ -59,14 +58,12 @@ Feature: Various checks
When I see the 'Tor is ready' notification
Then Tor is ready
- @fragile
Scenario: The tor process should be confined with Seccomp
Given I have started Tails from DVD without network and logged in
And the network is plugged
And Tor is ready
Then the running process "tor" is confined with Seccomp in filter mode
- @fragile
Scenario: No unexpected network services
Given I have started Tails from DVD without network and logged in
When the network is plugged
diff --git a/features/dhcp.feature b/features/dhcp.feature
index 18874db..0e17fce 100644
--- a/features/dhcp.feature
+++ b/features/dhcp.feature
@@ -1,4 +1,4 @@
-@product @fragile
+@product
Feature: Getting a DHCP lease without leaking too much information
As a Tails user
when I connect to a network with a DHCP server
diff --git a/features/electrum.feature b/features/electrum.feature
index e4e8d74..9807fec 100644
--- a/features/electrum.feature
+++ b/features/electrum.feature
@@ -1,17 +1,17 @@
-#10497: wait_until_tor_is_working
-#10720: Tails Installer freezes on Jenkins
-@product @check_tor_leaks @fragile
+@product @check_tor_leaks
Feature: Electrum Bitcoin client
As a Tails user
I might want to use a Bitcoin client
And all Internet traffic should flow only through Tor
Scenario: A warning will be displayed if Electrum is not persistent
- Given I have started Tails from DVD and logged in and the network is connected
+ Given I have started Tails from DVD without network and logged in
When I start Electrum through the GNOME menu
But persistence for "electrum" is not enabled
Then I see a warning that Electrum is not persistent
+ #10720: Tails Installer freezes on Jenkins
+ @fragile
Scenario: Using a persistent Electrum configuration
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
And the network is plugged
diff --git a/features/encryption.feature b/features/encryption.feature
index 608af8f..d4426f7 100644
--- a/features/encryption.feature
+++ b/features/encryption.feature
@@ -29,8 +29,7 @@ Feature: Encryption and verification using GnuPG
And I both encrypt and sign the message using my OpenPGP key
Then I can decrypt and verify the encrypted message
- #11394
- #11398
+ # 11394
@fragile
Scenario: Symmetric encryption and decryption using OpenPGP Applet
When I type a message into gedit
diff --git a/features/evince.feature b/features/evince.feature
index b413add..6fd27ec 100644
--- a/features/evince.feature
+++ b/features/evince.feature
@@ -21,8 +21,6 @@ Feature: Using Evince
Then I see "CupsTestPage.png" after at most 20 seconds
And I can print the current document to "/home/amnesia/output.pdf"
- #11398
- @fragile
Scenario: I cannot view a PDF file stored in non-persistent /home/amnesia/.gnupg
Given I have started Tails from DVD without network and logged in
And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia/.gnupg" as user "amnesia"
diff --git a/features/i2p.feature b/features/i2p.feature
index 876c72f..616c5ff 100644
--- a/features/i2p.feature
+++ b/features/i2p.feature
@@ -15,15 +15,11 @@ Feature: I2P
And the I2P Browser sudo rules are present
And the I2P firewall rules are enabled
- #10497
- @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
- #10497
- @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
@@ -31,7 +27,7 @@ Feature: I2P
Then the I2P router console is displayed in I2P Browser
And the I2P Browser uses all expected TBB shared libraries
- #10497, #11401, #11457, #11458
+ #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
@@ -41,7 +37,7 @@ Feature: I2P
Then I see the I2P Browser stop notification
And the I2P Browser chroot is torn down
- #10497, #11114, #11465
+ #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
@@ -52,8 +48,6 @@ Feature: I2P
When I open the address "http://i2p-projekt.i2p" in the I2P Browser
Then the I2P homepage loads in I2P Browser
- #10497
- @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
@@ -61,7 +55,7 @@ Feature: I2P
Then the I2P router console is displayed in I2P Browser
And I2P is running in hidden mode
- #10497, #10474
+ #10474
@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
@@ -76,7 +70,7 @@ Feature: I2P
Then Pidgin successfully connects to the "I2P" account
And I can join the pre-configured "#i2p" channel on "I2P"
- #10497, #11452
+ #11452
@fragile
Scenario: I2P displays a notice when bootstrapping fails
Given I have started Tails from DVD with I2P enabled and logged in
@@ -92,7 +86,7 @@ Feature: I2P
When I start the I2P Browser through the GNOME menu
Then the I2P router console is displayed in I2P Browser
- #10497, #11462
+ #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 88f4088..8693a44 100644
--- a/features/icedove.feature
+++ b/features/icedove.feature
@@ -1,4 +1,4 @@
-#10497, #11465
+#11465
@product @check_tor_leaks @fragile
Feature: Icedove email client
As a Tails user
diff --git a/features/localization.feature b/features/localization.feature
index f533add..4ec4a05 100644
--- a/features/localization.feature
+++ b/features/localization.feature
@@ -1,4 +1,4 @@
-@product @fragile
+@product
Feature: Localization
As a Tails user
I want Tails to be localized in my native language
@@ -9,7 +9,6 @@ Feature: Localization
Given I have started Tails from DVD without network and stopped at Tails Greeter's login screen
And the network is plugged
And I log in to a new session in German
- And Tails seems to have booted normally
And Tor is ready
When I double-click the Report an Error launcher on the desktop
Then the support documentation page opens in Tor Browser
diff --git a/features/mac_spoofing.feature b/features/mac_spoofing.feature
index 446a7f3..c775841 100644
--- a/features/mac_spoofing.feature
+++ b/features/mac_spoofing.feature
@@ -10,7 +10,6 @@ Feature: Spoofing MAC addresses
And I capture all network traffic
And the network is plugged
- @fragile
Scenario: MAC address spoofing is disabled
When I enable more Tails Greeter options
And I disable MAC spoofing in Tails Greeter
@@ -20,7 +19,6 @@ Feature: Spoofing MAC addresses
And the network device has its default MAC address configured
And the real MAC address was leaked
- @fragile
Scenario: MAC address spoofing is successful
When I log in to a new session
And Tor is ready
diff --git a/features/persistence.feature b/features/persistence.feature
index 907a711..42f91de 100644
--- a/features/persistence.feature
+++ b/features/persistence.feature
@@ -7,8 +7,7 @@ Feature: Tails persistence
Scenario: Booting Tails from a USB drive with a disabled persistent partition
Given I have started Tails without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
When I log in to a new session
- Then Tails seems to have booted normally
- And Tails is running from USB drive "__internal"
+ Then Tails is running from USB drive "__internal"
And persistence is disabled
But a Tails persistence partition exists on USB drive "__internal"
@@ -22,7 +21,6 @@ Feature: Tails persistence
And I start Tails from USB drive "__internal" with network unplugged and I login with read-only persistence enabled
Then all persistence presets but the first one are enabled
- @fragile
Scenario: Writing files first to a read/write-enabled persistent partition, and then to a read-only-enabled persistent partition
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
And the network is plugged
diff --git a/features/pidgin.feature b/features/pidgin.feature
index e0865f2..2aa74a8 100644
--- a/features/pidgin.feature
+++ b/features/pidgin.feature
@@ -1,5 +1,4 @@
-#10497: wait_until_tor_is_working
-@product @fragile
+@product
Feature: Chatting anonymously using Pidgin
As a Tails user
when I chat using Pidgin
@@ -22,7 +21,6 @@ Feature: Chatting anonymously using Pidgin
And I say something to my friend
Then I receive a response from my friend
- # 10376 - "the Tor Browser loads the (startup page|Tails roadmap)" step is fragile
#11414
@check_tor_leaks @fragile
Scenario: Chatting with some friend over XMPP in a multi-user chat
diff --git a/features/root_access_control.feature b/features/root_access_control.feature
index 800da98..fea20ff 100644
--- a/features/root_access_control.feature
+++ b/features/root_access_control.feature
@@ -21,8 +21,6 @@ Feature: Root access control enforcement
And running a command as root with pkexec requires PolicyKit administrator privileges
Then I should be able to run a command as root with pkexec
- #11398
- @fragile
Scenario: If no administrative password is set in Tails Greeter the live user should not be able to get administrative privileges through PolicyKit with the standard passwords.
Given I have started Tails from DVD without network and logged in
And running a command as root with pkexec requires PolicyKit administrator privileges
diff --git a/features/ssh.feature b/features/ssh.feature
index 8528999..0e64e86 100644
--- a/features/ssh.feature
+++ b/features/ssh.feature
@@ -1,4 +1,3 @@
-#10497: wait_until_tor_is_working
#10498: SSH tests are fragile
@product @fragile
Feature: Logging in via SSH
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index f441323..250700f 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -84,10 +84,8 @@ def robust_notification_wait(notification_image, time_to_wait)
found
end
- # Click anywhere to close the notification applet
- @screen.hide_cursor
- @screen.click("GnomeApplicationsMenu.png")
- @screen.hide_cursor
+ # Close the notification applet
+ @screen.type(Sikuli::Key.ESC)
end
def post_snapshot_restore_hook
@@ -201,7 +199,6 @@ Given /^I start Tails( from DVD)?( with network unplugged)?( and I login)?$/ do
step "the computer boots Tails"
if do_login
step "I log in to a new session"
- step "Tails seems to have booted normally"
if network_unplugged.nil?
step "Tor is ready"
step "all notifications have disappeared"
@@ -230,7 +227,6 @@ Given /^I start Tails from (.+?) drive "(.+?)"(| with network unplugged)( and I
end
end
step "I log in to a new session"
- step "Tails seems to have booted normally"
if network_unplugged.empty?
step "Tor is ready"
step "all notifications have disappeared"
@@ -335,6 +331,13 @@ Given /^Tails Greeter has dealt with the sudo password$/ do
}
end
+def florence_keyboard_is_visible
+ $vm.execute(
+ "xdotool search --all --onlyvisible --maxdepth 1 --classname 'Florence'",
+ :user => LIVE_USER,
+ ).success?
+end
+
Given /^the Tails desktop is ready$/ do
desktop_started_picture = "GnomeApplicationsMenu#{@language}.png"
# We wait for the Florence icon to be displayed to ensure reliable systray icon clicking.
@@ -352,11 +355,15 @@ Given /^the Tails desktop is ready$/ do
'gsettings set org.gnome.desktop.interface toolkit-accessibility true',
:user => LIVE_USER,
)
-
-end
-
-Then /^Tails seems to have booted normally$/ do
- step "the Tails desktop is ready"
+ # Sometimes the Florence window is not hidden on startup (#11398).
+ # Whenever that's the case, hide it ourselves and verify that it vanishes.
+ # I could not find that window using Accerciser, so I'm not using dogtail;
+ # and it doesn't feel worth it to add an image and use Sikuli, since we can
+ # instead do this programmatically with xdotool.
+ if florence_keyboard_is_visible
+ @screen.click("GnomeSystrayFlorence.png")
+ try_for(5, delay: 0.1) { ! florence_keyboard_is_visible }
+ end
end
When /^I see the 'Tor is ready' notification$/ do
@@ -425,8 +432,12 @@ Given /^the Tor Browser has a bookmark to eff.org$/ do
end
Given /^all notifications have disappeared$/ do
- next if not(@screen.exists("GnomeNotificationApplet.png"))
- @screen.click("GnomeNotificationApplet.png")
+ begin
+ @screen.click("GnomeNotificationApplet.png")
+ rescue FindFailed
+ # No notifications, so we're done here.
+ next
+ end
@screen.wait("GnomeNotificationAppletOpened.png", 10)
begin
entries = @screen.findAll("GnomeNotificationEntry.png")
diff --git a/features/time_syncing.feature b/features/time_syncing.feature
index cc75f3a..cda75f6 100644
--- a/features/time_syncing.feature
+++ b/features/time_syncing.feature
@@ -4,16 +4,12 @@ Feature: Time syncing
I want Tor to work properly
And for that I need a reasonably accurate system clock
- #10497: wait_until_tor_is_working
- @fragile
Scenario: Clock with host's time
Given I have started Tails from DVD without network and logged in
When the network is plugged
And Tor is ready
Then Tails clock is less than 5 minutes incorrect
- #10497: wait_until_tor_is_working
- @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_bridges.feature b/features/tor_bridges.feature
index 463714f..bda0304 100644
--- a/features/tor_bridges.feature
+++ b/features/tor_bridges.feature
@@ -1,4 +1,4 @@
-@product @fragile
+@product
Feature: Using Tails with Tor pluggable transports
As a Tails user
I want to circumvent censorship of Tor by using Tor pluggable transports
diff --git a/features/tor_enforcement.feature b/features/tor_enforcement.feature
index 82def31..a958b14 100644
--- a/features/tor_enforcement.feature
+++ b/features/tor_enforcement.feature
@@ -1,5 +1,4 @@
-#10497: wait_until_tor_is_working
-@product @fragile
+@product
Feature: The Tor enforcement is effective
As a Tails user
I want all direct Internet connections I do by mistake or applications do by misconfiguration or buggy leaks to be blocked
diff --git a/features/tor_stream_isolation.feature b/features/tor_stream_isolation.feature
index c51c641..59aa34d 100644
--- a/features/tor_stream_isolation.feature
+++ b/features/tor_stream_isolation.feature
@@ -1,5 +1,4 @@
-#10497: wait_until_tor_is_working
-@product @check_tor_leaks @fragile
+@product @check_tor_leaks
Feature: Tor stream isolation is effective
As a Tails user
I want my Torified sessions to be sensibly isolated from each other to prevent identity correlation
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index c471e27..222e350 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -1,6 +1,4 @@
-#10376: The "the Tor Browser loads the (startup page|Tails roadmap)" step is fragile
-#10497: wait_until_tor_is_working
-@product @fragile
+@product
Feature: Browsing the web using the Tor Browser
As a Tails user
when I browse the web using the Tor Browser
@@ -126,7 +124,7 @@ Feature: Browsing the web using the Tor Browser
And the Tor Browser has started and loaded the startup page
Then the Tor Browser has no plugins installed
- #10497, #10720
+ #10720
@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
diff --git a/features/torified_git.feature b/features/torified_git.feature
index 04e19a5..64f93a6 100644
--- a/features/torified_git.feature
+++ b/features/torified_git.feature
@@ -1,5 +1,3 @@
-#10497: wait_until_tor_is_working
-#10444: Git tests are fragile
@product @check_tor_leaks @fragile
Feature: Cloning a Git repository
As a Tails user
diff --git a/features/torified_gnupg.feature b/features/torified_gnupg.feature
index cbdab7f..bba2744 100644
--- a/features/torified_gnupg.feature
+++ b/features/torified_gnupg.feature
@@ -1,4 +1,4 @@
-@product @check_tor_leaks @fragile
+@product @check_tor_leaks
Feature: Keyserver interaction with GnuPG
As a Tails user
when I interact with keyservers using various GnuPG tools
diff --git a/features/torified_misc.feature b/features/torified_misc.feature
index 75f3fd0..5bb83c8 100644
--- a/features/torified_misc.feature
+++ b/features/torified_misc.feature
@@ -1,4 +1,4 @@
-@product @check_tor_leaks @fragile
+@product @check_tor_leaks
Feature: Various checks for torified software
Background:
diff --git a/features/totem.feature b/features/totem.feature
index 0e6fa05..c5fb37a 100644
--- a/features/totem.feature
+++ b/features/totem.feature
@@ -40,7 +40,6 @@ Feature: Using Totem
# as /lib/live/mount/overlay.
And AppArmor has denied "/usr/bin/totem" from opening "/lib/live/mount/overlay/home/amnesia/.gnupg/video.mp4"
- #10497: wait_until_tor_is_working
@check_tor_leaks @fragile
Scenario: Watching a WebM video over HTTPS
Given I have started Tails from DVD and logged in and the network is connected
diff --git a/features/unsafe_browser.feature b/features/unsafe_browser.feature
index f2f6291..a0a26fa 100644
--- a/features/unsafe_browser.feature
+++ b/features/unsafe_browser.feature
@@ -4,7 +4,7 @@ Feature: Browsing the web using the Unsafe Browser
when I browse the web using the Unsafe Browser
I should have direct access to the web
- #10497, #11401, #11458
+ #11458
@fragile
Scenario: The Unsafe Browser can access the LAN
Given I have started Tails from DVD and logged in and the network is connected
@@ -13,7 +13,7 @@ Feature: Browsing the web using the Unsafe Browser
And I open a page on the LAN web server in the Unsafe Browser
Then I see "UnsafeBrowserHelloLANWebServer.png" after at most 20 seconds
- #10497, #11458
+ #11458
@fragile
Scenario: Starting the Unsafe Browser works as it should.
Given I have started Tails from DVD and logged in and the network is connected
@@ -27,7 +27,7 @@ Feature: Browsing the web using the Unsafe Browser
And the Unsafe Browser has no proxy configured
And the Unsafe Browser uses all expected TBB shared libraries
- #10497, #11457, #11458
+ #11457, #11458
@fragile
Scenario: Closing the Unsafe Browser shows a stop notification and properly tears down the chroot.
Given I have started Tails from DVD and logged in and the network is connected
@@ -36,7 +36,7 @@ Feature: Browsing the web using the Unsafe Browser
Then I see the Unsafe Browser stop notification
And the Unsafe Browser chroot is torn down
- #10497, #11401, #11458
+ #11458
@fragile
Scenario: Starting a second instance of the Unsafe Browser results in an error message being shown.
Given I have started Tails from DVD and logged in and the network is connected
@@ -44,14 +44,14 @@ Feature: Browsing the web using the Unsafe Browser
And I start the Unsafe Browser
Then I see a warning about another instance already running
- #10497, #11401, #11458
+ #11458
@fragile
Scenario: The Unsafe Browser cannot be configured to use Tor and other local proxies.
Given I have started Tails from DVD and logged in and the network is connected
When I successfully start the Unsafe Browser
Then I cannot configure the Unsafe Browser to use any local proxies
- #10497, #11458
+ #11458
@fragile
Scenario: The Unsafe Browser will not make any connections to the Internet which are not user initiated
Given I have started Tails from DVD and logged in and the network is connected
diff --git a/features/untrusted_partitions.feature b/features/untrusted_partitions.feature
index 5549013..b1045c4 100644
--- a/features/untrusted_partitions.feature
+++ b/features/untrusted_partitions.feature
@@ -50,7 +50,6 @@ Feature: Untrusted partitions
And I set Tails to boot with options "live-media="
When I start Tails with network unplugged and I login
Then Tails is running from ide drive "live_hd"
- And Tails seems to have booted normally
Scenario: Tails booting from a DVD does not use live systems stored on hard drives
Given a computer
diff --git a/features/usb_install.feature b/features/usb_install.feature
index 750df7a..e8ce2fe 100644
--- a/features/usb_install.feature
+++ b/features/usb_install.feature
@@ -42,7 +42,6 @@ Feature: Installing Tails to a USB drive
Scenario: Booting Tails from a USB drive without a persistent partition and creating one
Given I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen
And I log in to a new session
- Then Tails seems to have booted normally
When I create a persistent partition
Then a Tails persistence partition exists on USB drive "__internal"
@@ -51,8 +50,7 @@ Feature: Installing Tails to a USB drive
Scenario: Booting Tails from a USB drive without a persistent partition
Given I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen
When I log in to a new session
- Then Tails seems to have booted normally
- And Tails is running from USB drive "__internal"
+ Then Tails is running from USB drive "__internal"
And the persistent Tor Browser directory does not exist
And there is no persistence partition on USB drive "__internal"
diff --git a/features/usb_upgrade.feature b/features/usb_upgrade.feature
index 422596d..fc61308 100644
--- a/features/usb_upgrade.feature
+++ b/features/usb_upgrade.feature
@@ -112,7 +112,6 @@ Feature: Upgrading an old Tails USB installation
Scenario: Upgrading an old Tails USB installation from another Tails USB drive
Given I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen
And I log in to a new session
- And Tails seems to have booted normally
And I clone USB drive "old" to a new USB drive "to_upgrade"
And I plug USB drive "to_upgrade"
When I "Clone & Upgrade" Tails to USB drive "to_upgrade"
diff --git a/import-translations b/import-translations
index a74ad8e..3e788d7 100755
--- a/import-translations
+++ b/import-translations
@@ -20,6 +20,9 @@ lang_is_excluded () {
echo -n "$EXCLUDE_LANGS" | grep -qs -w "$lang"
}
+# Defaults
+LANG_DOT_PO_LAYOUT=yes
+
# Detect which project is in current folder,
# and set parameters accordingly
if [ -f 'po/tails.pot' ]; then
@@ -32,6 +35,8 @@ elif [ -f 'po/tails-iuk.pot' ]; then
BRANCH='tails-iuk_completed'
AFTER_IMPORT='make -C po pot && make -C po update-po'
elif [ -f 'po/onioncircuits.pot' ]; then
+ LANG_DOT_PO_LAYOUT=no
+ POTFILE=onioncircuits.pot
BRANCH='tails-onioncircuits_completed'
AFTER_IMPORT='./setup.py build_i18n && ( cd po && for po in *.po ; do msgmerge --update "$po" onioncircuits.pot ; done )'
elif [ -f 'po/tails-perl5lib.pot' ]; then
@@ -65,14 +70,25 @@ eval "$GIT_IN_TOR_TRANSLATION_DIR reset --hard \"origin/$BRANCH\""
# For each completely translated language, merge it,
# unless it is translated outside Transifex
-find "$TOR_TRANSLATION_DIR" -name '*.po' | while read po_file; do
- lang=$(basename "$po_file" | tr - _ | sed 's/\.po$//')
+if [ "$LANG_DOT_PO_LAYOUT" = yes ] ; then
+ find "$TOR_TRANSLATION_DIR" -name '*.po' | while read po_file; do
+ lang=$(basename "$po_file" | tr - _ | sed 's/\.po$//')
+
+ if ! lang_is_excluded "$lang"; then
+ echo "Importing translation for $lang..."
+ cp "$po_file" "$TAILS_PO_DIR"
+ fi
+ done
+else
+ find "$TOR_TRANSLATION_DIR" -name '*.pot' | while read po_file; do
+ lang=$(basename $(dirname "$po_file" | tr - _ | sed 's/\.pot$//'))
- if ! lang_is_excluded "$lang"; then
- echo "Importing translation for $lang..."
- cp "$po_file" "$TAILS_PO_DIR"
- fi
-done
+ if ! lang_is_excluded "$lang"; then
+ echo "Importing translation for $lang..."
+ cp "$po_file" "$TAILS_PO_DIR/${lang}.po"
+ fi
+ done
+fi
# Update PO files
if [ -n "${AFTER_IMPORT:-}" ]; then