rough attempt to grab the good cucumber bits from recent tails

1 files changed, 37 insertions, 26 deletions

diff --git a/features/totem.feature b/features/totem.feature
index 2729b273..0e6fa05d 100644
--- a/features/totem.feature
+++ b/features/totem.feature
@@ -5,10 +5,6 @@ Feature: Using Totem
   And AppArmor should prevent Totem from doing dangerous things
   And all Internet traffic should flow only through Tor
 
-  # We cannot use Background to save a snapshot of an already booted
-  # Tails here, due to bugs with filesystem shares vs. snapshots, as
-  # explained in checks.feature.
-
   Background:
     Given I create sample videos
 
@@ -17,43 +13,58 @@ Feature: Using Totem
     And I setup a filesystem share containing sample videos
     And I start Tails from DVD with network unplugged and I login
     And I copy the sample videos to "/home/amnesia" as user "amnesia"
+    And the file "/home/amnesia/video.mp4" exists
+    Given I start monitoring the AppArmor log of "/usr/bin/totem"
     When I open "/home/amnesia/video.mp4" with Totem
-    Then I see "SampleLocalMp4VideoFrame.png" after at most 10 seconds
+    Then I see "SampleLocalMp4VideoFrame.png" after at most 20 seconds
+    And AppArmor has not denied "/usr/bin/totem" from opening "/home/amnesia/video.mp4"
     Given I close Totem
     And I copy the sample videos to "/home/amnesia/.gnupg" as user "amnesia"
+    And the file "/home/amnesia/.gnupg/video.mp4" exists
+    And I restart monitoring the AppArmor log of "/usr/bin/totem"
     When I try to open "/home/amnesia/.gnupg/video.mp4" with Totem
     Then I see "TotemUnableToOpen.png" after at most 10 seconds
+    And AppArmor has denied "/usr/bin/totem" from opening "/home/amnesia/.gnupg/video.mp4"
+    Given I close Totem
+    And the file "/lib/live/mount/overlay/home/amnesia/.gnupg/video.mp4" exists
+    And I restart monitoring the AppArmor log of "/usr/bin/totem"
+    When I try to open "/lib/live/mount/overlay/home/amnesia/.gnupg/video.mp4" with Totem
+    Then I see "TotemUnableToOpen.png" after at most 10 seconds
+    And AppArmor has denied "/usr/bin/totem" from opening "/lib/live/mount/overlay/home/amnesia/.gnupg/video.mp4"
+    Given I close Totem
+    And the file "/live/overlay/home/amnesia/.gnupg/video.mp4" exists
+    And I restart monitoring the AppArmor log of "/usr/bin/totem"
+    When I try to open "/live/overlay/home/amnesia/.gnupg/video.mp4" with Totem
+    Then I see "TotemUnableToOpen.png" after at most 10 seconds
+    # Due to our AppArmor aliases, /live/overlay will be treated
+    # as /lib/live/mount/overlay.
+    And AppArmor has denied "/usr/bin/totem" from opening "/lib/live/mount/overlay/home/amnesia/.gnupg/video.mp4"
 
-  Scenario: Watching a WebM video over HTTPS, with and without the command-line
-    Given a computer
-    And I capture all network traffic
-    And I start Tails from DVD and I login
-    When I open "https://webm.html5.org/test.webm" with Totem
-    Then I see "SampleRemoteWebMVideoFrame.png" after at most 10 seconds
-    When I close Totem
-    And I start Totem through the GNOME menu
-    When I load the "https://webm.html5.org/test.webm" URL in Totem
-    Then I see "SampleRemoteWebMVideoFrame.png" after at most 10 seconds
-    And all Internet traffic has only flowed through Tor
+  #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
+    Then I can watch a WebM video over HTTPs
 
-  @keep_volumes
-  Scenario: Installing Tails on a USB drive, creating a persistent partition, copying video files to it
-    Given the USB drive "current" contains Tails with persistence configured and password "asdf"
-    And a computer
+  #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
+    # filesystem shares.
+    And I shutdown Tails and wait for the computer to power off
     And I setup a filesystem share containing sample videos
-    And I start Tails from USB drive "current" with network unplugged and I login with persistence password "asdf"
+    And I start Tails from USB drive "__internal" with network unplugged and I login with persistence enabled
     And I copy the sample videos to "/home/amnesia/Persistent" as user "amnesia"
     And I copy the sample videos to "/home/amnesia/.gnupg" as user "amnesia"
     And I shutdown Tails and wait for the computer to power off
-
-  @keep_volumes
-  Scenario: Watching a MP4 video stored on the persistent volume
-    Given a computer
-    And I start Tails from USB drive "current" with network unplugged and I login with persistence password "asdf"
+    And I start Tails from USB drive "__internal" with network unplugged and I login with persistence enabled
     And the file "/home/amnesia/Persistent/video.mp4" exists
     When I open "/home/amnesia/Persistent/video.mp4" with Totem
     Then I see "SampleLocalMp4VideoFrame.png" after at most 10 seconds
     Given I close Totem
     And the file "/home/amnesia/.gnupg/video.mp4" exists
+    And I start monitoring the AppArmor log of "/usr/bin/totem"
     When I try to open "/home/amnesia/.gnupg/video.mp4" with Totem
     Then I see "TotemUnableToOpen.png" after at most 10 seconds
+    And AppArmor has denied "/usr/bin/totem" from opening "/home/amnesia/.gnupg/video.mp4"