summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-06-16 16:38:41 +0200
committeranonym <anonym@riseup.net>2016-06-16 16:38:41 +0200
commit4fe6a4085ab74842d28a2af41fd1e6f97b6ff5b4 (patch)
tree836086ed9ad3bd1cb99397a212e930e95ee601eb
parente9ef289865e28658884ab3273cb7e2a9aacfbf40 (diff)
parent5107c485ff29e48bf983c1432e84089ed706e6ab (diff)
Merge remote-tracking branch 'origin/bugfix/10720-installer-freezes-on-jenkins' into test/10504-allow-more-boot_devices
-rw-r--r--config/APT_overlays.d/bugfix-10720-installer-freezes-on-jenkins0
-rw-r--r--config/chroot_apt/preferences2
-rw-r--r--features/checks.feature2
-rw-r--r--features/domains/default.xml2
-rw-r--r--features/electrum.feature3
-rw-r--r--features/evince.feature4
-rw-r--r--features/persistence.feature3
-rw-r--r--features/pidgin.feature3
-rw-r--r--features/step_definitions/usb.rb15
-rw-r--r--features/torified_browsing.feature4
-rw-r--r--features/totem.feature2
-rw-r--r--features/usb_install.feature12
-rw-r--r--features/usb_upgrade.feature3
13 files changed, 15 insertions, 40 deletions
diff --git a/config/APT_overlays.d/bugfix-10720-installer-freezes-on-jenkins b/config/APT_overlays.d/bugfix-10720-installer-freezes-on-jenkins
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/bugfix-10720-installer-freezes-on-jenkins
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 411b2aa..d309843 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -128,7 +128,7 @@ Pin: release o=Debian,n=stretch
Pin-Priority: 999
Package: tails-installer
-Pin: origin deb.tails.boum.org
+Pin: origin deb.tails.boum.org version 4.4.7+dfsg-0tails1+bugfix.10720~1.gbp874017
Pin-Priority: 999
Package: ttdnsd
diff --git a/features/checks.feature b/features/checks.feature
index bbda069..63dbcf2 100644
--- a/features/checks.feature
+++ b/features/checks.feature
@@ -89,8 +89,6 @@ Feature: Various checks
When I eject the boot medium
Then Tails eventually shuts down
- #10720
- @fragile
Scenario: Tails shuts down on USB boot medium removal
Given I have started Tails without network from a USB drive without a persistent partition and logged in
When I eject the boot medium
diff --git a/features/domains/default.xml b/features/domains/default.xml
index 924bb85..f15f75f 100644
--- a/features/domains/default.xml
+++ b/features/domains/default.xml
@@ -1,7 +1,7 @@
<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
<memory unit='KiB'>2097152</memory>
<currentMemory unit='KiB'>2097152</currentMemory>
- <vcpu>1</vcpu>
+ <vcpu>2</vcpu>
<os>
<type arch='x86_64' machine='pc-0.15'>hvm</type>
<boot dev='cdrom'/>
diff --git a/features/electrum.feature b/features/electrum.feature
index 9807fec..228eb0e 100644
--- a/features/electrum.feature
+++ b/features/electrum.feature
@@ -1,4 +1,3 @@
-@product @check_tor_leaks
Feature: Electrum Bitcoin client
As a Tails user
I might want to use a Bitcoin client
@@ -10,8 +9,6 @@ Feature: Electrum Bitcoin client
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/evince.feature b/features/evince.feature
index 6fd27ec..4ea6035 100644
--- a/features/evince.feature
+++ b/features/evince.feature
@@ -44,8 +44,6 @@ Feature: Using Evince
# as /lib/live/mount/overlay.
And AppArmor has denied "/usr/bin/evince" from opening "/lib/live/mount/overlay/home/amnesia/.gnupg/default-testpage.pdf"
- #10720: Tails Installer freezes on Jenkins
- @fragile
Scenario: I can view and print a PDF file stored in persistent /home/amnesia/Persistent
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia/Persistent" as user "amnesia"
@@ -54,8 +52,6 @@ Feature: Using Evince
Then I see "CupsTestPage.png" after at most 20 seconds
And I can print the current document to "/home/amnesia/Persistent/output.pdf"
- #10720: Tails Installer freezes on Jenkins
- @fragile
Scenario: I cannot view a PDF file stored in persistent /home/amnesia/.gnupg
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia/.gnupg" as user "amnesia"
diff --git a/features/persistence.feature b/features/persistence.feature
index 42f91de..241aedf 100644
--- a/features/persistence.feature
+++ b/features/persistence.feature
@@ -1,5 +1,4 @@
-#10720: Tails Installer freezes on Jenkins
-@product @fragile
+@product
Feature: Tails persistence
As a Tails user
I want to use Tails persistence feature
diff --git a/features/pidgin.feature b/features/pidgin.feature
index aabe9b7..6bfeb01 100644
--- a/features/pidgin.feature
+++ b/features/pidgin.feature
@@ -91,8 +91,7 @@ Feature: Chatting anonymously using Pidgin
And I close Pidgin's certificate manager
Then I cannot add a certificate from the "/live/overlay/home/amnesia/.gnupg" directory to Pidgin
- #10720: Tails Installer freezes on Jenkins
- @check_tor_leaks @fragile
+ @check_tor_leaks
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
And Pidgin has the expected accounts configured with random nicknames
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index e8b4cf5..dbf2b7b 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -73,14 +73,19 @@ def usb_install_helper(name)
if @screen.exists("USBCannotUpgrade.png")
raise UpgradeNotSupported
end
- @screen.wait_and_click('USBCreateLiveUSB.png', 10)
- @screen.wait('USBCreateLiveUSBConfirmWindow.png', 10)
- @screen.wait_and_click('USBCreateLiveUSBConfirmYes.png', 10)
- @screen.wait('USBInstallationComplete.png', 30*60)
+ begin
+ @screen.wait_and_click('USBCreateLiveUSB.png', 10)
+ @screen.wait('USBCreateLiveUSBConfirmWindow.png', 10)
+ @screen.wait_and_click('USBCreateLiveUSBConfirmYes.png', 10)
+ @screen.wait('USBInstallationComplete.png', 30*60)
+ rescue FindFailed => e
+ debug_log("Tails Installer debug log:\n" + $vm.file_content('/tmp/tails-installer-*'))
+ raise e
+ end
end
When /^I start Tails Installer$/ do
- step 'I start "Tails Installer" via the GNOME "Tails" applications menu'
+ step 'I run "export DEBUG=1 ; tails-installer-launcher" in GNOME Terminal'
@screen.wait('USBCloneAndInstall.png', 30)
end
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index 52fda62..4687296 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -113,8 +113,6 @@ 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
- #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
And the network is plugged
@@ -130,8 +128,6 @@ 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
- @fragile
Scenario: Persistent browser bookmarks
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
And all persistence presets are enabled
diff --git a/features/totem.feature b/features/totem.feature
index c5fb37a..a4eede8 100644
--- a/features/totem.feature
+++ b/features/totem.feature
@@ -45,8 +45,6 @@ Feature: Using Totem
Given I have started Tails from DVD and logged in and the network is connected
Then I can watch a WebM video over HTTPs
- #10720: Tails Installer freezes on Jenkins
- @fragile
Scenario: Watching MP4 videos stored on the persistent volume should work as expected given our AppArmor confinement
Given I have started Tails without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
# Due to bug #5571 we have to reboot to be able to use
diff --git a/features/usb_install.feature b/features/usb_install.feature
index e8ce2fe..c5aa60e 100644
--- a/features/usb_install.feature
+++ b/features/usb_install.feature
@@ -27,8 +27,6 @@ Feature: Installing Tails to a USB drive
Then no USB drive is selected
And a suitable USB device is not found
- #10720: Tails Installer freezes on Jenkins
- @fragile
Scenario: Installing Tails to a pristine USB drive
Given I have started Tails from DVD without network and logged in
And I temporarily create a 4 GiB disk named "install"
@@ -37,16 +35,12 @@ Feature: Installing Tails to a USB drive
Then the running Tails is installed on USB drive "install"
But there is no persistence partition on USB drive "install"
- #10720: Tails Installer freezes on Jenkins
- @fragile
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
When I create a persistent partition
Then a Tails persistence partition exists on USB drive "__internal"
- #10720: Tails Installer freezes on Jenkins
- @fragile
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
@@ -54,8 +48,6 @@ Feature: Installing Tails to a USB drive
And the persistent Tor Browser directory does not exist
And there is no persistence partition on USB drive "__internal"
- #10720: Tails Installer freezes on Jenkins
- @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
Then I power off the computer
@@ -66,8 +58,6 @@ Feature: Installing Tails to a USB drive
And the boot device has safe access rights
And Tails has started in UEFI mode
- #10720: Tails Installer freezes on Jenkins
- @fragile
Scenario: Installing Tails to a USB drive with an MBR partition table but no partitions, and making sure that it boots
Given I have started Tails from DVD without network and logged in
And I temporarily create a 4 GiB disk named "mbr"
@@ -82,8 +72,6 @@ Feature: Installing Tails to a USB drive
And the boot device has safe access rights
And there is no persistence partition on USB drive "mbr"
- #10720: Tails Installer freezes on Jenkins
- @fragile
Scenario: Cat:ing a Tails isohybrid to a USB drive and booting it, then trying to upgrading it but ending up having to do a fresh installation, which boots
Given a computer
And I temporarily create a 4 GiB disk named "isohybrid"
diff --git a/features/usb_upgrade.feature b/features/usb_upgrade.feature
index fc61308..3ffa7d0 100644
--- a/features/usb_upgrade.feature
+++ b/features/usb_upgrade.feature
@@ -1,5 +1,4 @@
-#10720: Tails Installer freezes on Jenkins
-@product @fragile
+@product
Feature: Upgrading an old Tails USB installation
As a Tails user
If I have an old versoin of Tails installed on a USB device