Commit 9121667e authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/testing' into web/11369-2.4-release-notes

parents 09ff3a4e 52f27ea3
......@@ -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
......
......@@ -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
......
......@@ -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
#!/bin/sh
set -e
echo "Disabling system-config-printer applet"
echo "X-GNOME-Autostart-enabled=false" \
>> /etc/xdg/autostart/print-applet.desktop
......@@ -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
......
......@@ -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
......
@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
......
#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
......
......@@ -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
......
......@@ -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"
......
......@@ -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
......
#10497, #11465
#11465
@product @check_tor_leaks @fragile
Feature: Icedove email client
As a Tails user
......
@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
......
......@@ -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
......
......@@ -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
......
#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
......
......@@ -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
......
#10497: wait_until_tor_is_working
#10498: SSH tests are fragile
@product @fragile
Feature: Logging in via SSH
......
......@@ -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")
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment