summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-07-17 12:40:09 +0000
committerintrigeri <intrigeri@boum.org>2017-07-17 12:40:09 +0000
commit8368fba94972437ef9907e8d4080bb1951df5051 (patch)
tree399f51343c95a80409f8aa67cbbd749575d62f72
parentaedb7ef5fbf53e5abff2b8d5313820ae341f0c8e (diff)
parent762fe238ff9f429f8d01b8449628f10063e58e37 (diff)
Merge branch 'stable' into devel
-rw-r--r--features/emergency_shutdown.feature4
-rw-r--r--features/gnome.feature2
-rw-r--r--features/usb_install.feature2
3 files changed, 8 insertions, 0 deletions
diff --git a/features/emergency_shutdown.feature b/features/emergency_shutdown.feature
index 56a3d8a..639b334 100644
--- a/features/emergency_shutdown.feature
+++ b/features/emergency_shutdown.feature
@@ -19,6 +19,8 @@ Feature: Emergency shutdown
And I wait for Tails to finish wiping the memory
Then I find very few patterns in the guest's memory
+ #13462
+ @fragile
Scenario: Tails erases memory on DVD boot medium removal: vfat
Given I have started Tails from DVD without network and logged in
And I prepare Tails for memory erasure tests
@@ -30,6 +32,8 @@ Feature: Emergency shutdown
And I wait for Tails to finish wiping the memory
Then I find very few patterns in the guest's memory
+ #13462
+ @fragile
Scenario: Tails erases memory on DVD boot medium removal: LUKS-encrypted ext4
Given I have started Tails from DVD without network and logged in
And I prepare Tails for memory erasure tests
diff --git a/features/gnome.feature b/features/gnome.feature
index b947297..6816f12 100644
--- a/features/gnome.feature
+++ b/features/gnome.feature
@@ -1,6 +1,8 @@
@product
Feature: GNOME is well-integrated into Tails
+ #13458
+ @fragile
Scenario: A screenshot is taken when the PRINTSCREEN key is pressed
Given I have started Tails from DVD without network and logged in
And I wait 10 seconds
diff --git a/features/usb_install.feature b/features/usb_install.feature
index 6eb59d6..8cce69c 100644
--- a/features/usb_install.feature
+++ b/features/usb_install.feature
@@ -48,6 +48,8 @@ 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"
+ #13459
+ @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