rough attempt to grab the good cucumber bits from recent tails

1 files changed, 50 insertions, 11 deletions

diff --git a/features/untrusted_partitions.feature b/features/untrusted_partitions.feature
index 816fbe7e..55490136 100644
--- a/features/untrusted_partitions.feature
+++ b/features/untrusted_partitions.feature
@@ -3,18 +3,59 @@ Feature: Untrusted partitions
   As a Tails user
   I don't want to touch other media than the one Tails runs from
 
-  @keep_volumes
+  Scenario: Tails will not enable disk swap
+    Given a computer
+    And I temporarily create a 100 MiB disk named "swap"
+    And I create a gpt swap partition on disk "swap"
+    And I plug ide drive "swap"
+    When I start Tails with network unplugged and I login
+    Then a "swap" partition was detected by Tails on drive "swap"
+    But Tails has no disk swap enabled
+
+  Scenario: Tails will detect LUKS-encrypted GPT partitions labeled "TailsData" stored on USB drives as persistence volumes when the removable flag is set
+    Given a computer
+    And I temporarily create a 100 MiB disk named "fake_TailsData"
+    And I create a gpt partition labeled "TailsData" with an ext4 filesystem encrypted with password "asdf" on disk "fake_TailsData"
+    And I plug removable usb drive "fake_TailsData"
+    When I start the computer
+    And the computer boots Tails
+    Then drive "fake_TailsData" is detected by Tails
+    And Tails Greeter has detected a persistence partition
+
+  Scenario: Tails will not detect LUKS-encrypted GPT partitions labeled "TailsData" stored on USB drives as persistence volumes when the removable flag is unset
+    Given a computer
+    And I temporarily create a 100 MiB disk named "fake_TailsData"
+    And I create a gpt partition labeled "TailsData" with an ext4 filesystem encrypted with password "asdf" on disk "fake_TailsData"
+    And I plug non-removable usb drive "fake_TailsData"
+    When I start the computer
+    And the computer boots Tails
+    Then drive "fake_TailsData" is detected by Tails
+    And Tails Greeter has not detected a persistence partition
+
+  Scenario: Tails will not detect LUKS-encrypted GPT partitions labeled "TailsData" stored on local hard drives as persistence volumes
+    Given a computer
+    And I temporarily create a 100 MiB disk named "fake_TailsData"
+    And I create a gpt partition labeled "TailsData" with an ext4 filesystem encrypted with password "asdf" on disk "fake_TailsData"
+    And I plug ide drive "fake_TailsData"
+    When I start the computer
+    And the computer boots Tails
+    Then drive "fake_TailsData" is detected by Tails
+    And Tails Greeter has not detected a persistence partition
+
   Scenario: Tails can boot from live systems stored on hard drives
     Given a computer
-    And I create a 2 GiB disk named "live_hd"
-    And I cat an ISO hybrid of the Tails image to disk "live_hd"
+    And I temporarily create a 2 GiB disk named "live_hd"
+    And I cat an ISO of the Tails image to disk "live_hd"
     And the computer is set to boot from ide drive "live_hd"
     And I set Tails to boot with options "live-media="
-    And I start Tails from DVD with network unplugged and I login
-    Then Tails seems to have booted normally
+    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
+    And I temporarily create a 2 GiB disk named "live_hd"
+    And I cat an ISO of the Tails image to disk "live_hd"
     And I plug ide drive "live_hd"
     And I start Tails from DVD with network unplugged and I login
     Then drive "live_hd" is detected by Tails
@@ -22,9 +63,8 @@ Feature: Untrusted partitions
 
   Scenario: Booting Tails does not automount untrusted ext2 partitions
     Given a computer
-    And I create a 100 MiB disk named "gpt_ext2"
-    And I create a gpt label on disk "gpt_ext2"
-    And I create a ext2 filesystem on disk "gpt_ext2"
+    And I temporarily create a 100 MiB disk named "gpt_ext2"
+    And I create a gpt partition with an ext2 filesystem on disk "gpt_ext2"
     And I plug ide drive "gpt_ext2"
     And I start Tails from DVD with network unplugged and I login
     Then drive "gpt_ext2" is detected by Tails
@@ -32,9 +72,8 @@ Feature: Untrusted partitions
 
   Scenario: Booting Tails does not automount untrusted fat32 partitions
     Given a computer
-    And I create a 100 MiB disk named "msdos_fat32"
-    And I create a msdos label on disk "msdos_fat32"
-    And I create a fat32 filesystem on disk "msdos_fat32"
+    And I temporarily create a 100 MiB disk named "msdos_fat32"
+    And I create an msdos partition with a vfat filesystem on disk "msdos_fat32"
     And I plug ide drive "msdos_fat32"
     And I start Tails from DVD with network unplugged and I login
     Then drive "msdos_fat32" is detected by Tails