Commit d63d41e9 authored by anonym's avatar anonym
Browse files

Give a more thoughtful name for the disk used by our snapshots.

Hopefully a test writer would think twice before re-using this name
when creating a new disk, so we won't repeat #10907.

Refs: #10907
parent 3e8ef908
......@@ -27,7 +27,7 @@ Feature: Electrum Bitcoin client
And I see the main Electrum client window
And Electrum successfully connects to the network
And I shutdown Tails and wait for the computer to power off
Given I start Tails from USB drive "current" and I login with persistence enabled
Given I start Tails from USB drive "__internal" and I login with persistence enabled
When I start Electrum through the GNOME menu
And a bitcoin wallet is present
And I see the main Electrum client window
......
......@@ -8,13 +8,13 @@ Feature: Tails persistence
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 "current"
And Tails is running from USB drive "__internal"
And persistence is disabled
But a Tails persistence partition exists on USB drive "current"
But a Tails persistence partition exists on USB drive "__internal"
Scenario: Booting Tails from a USB drive with an enabled persistent partition
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
Then Tails is running from USB drive "current"
Then Tails is running from USB drive "__internal"
And all persistence presets are enabled
And all persistent directories have safe access rights
......@@ -28,11 +28,11 @@ Feature: Tails persistence
And I add a wired DHCP NetworkManager connection called "persistent-con"
And I shutdown Tails and wait for the computer to power off
# XXX: The next step succeeds (and the --debug output confirms that it's actually looking for the files) but will fail in a subsequent scenario restoring the same snapshot. This exactly what we want, but why does it work? What is guestfs's behaviour when qcow2 internal snapshots are involved?
Then only the expected files are present on the persistence partition on USB drive "current"
Given I start Tails from USB drive "current" with network unplugged and I login with read-only persistence enabled
Then only the expected files are present on the persistence partition on USB drive "__internal"
Given I start Tails from USB drive "__internal" with network unplugged and I login with read-only persistence enabled
And the network is plugged
And Tor is ready
Then Tails is running from USB drive "current"
Then Tails is running from USB drive "__internal"
And the boot device has safe access rights
And all persistence presets are enabled
And I switch to the "persistent-con" NetworkManager connection
......@@ -41,15 +41,15 @@ Feature: Tails persistence
And I remove some files expected to persist
And I take note of which persistence presets are available
And I shutdown Tails and wait for the computer to power off
Then only the expected files are present on the persistence partition on USB drive "current"
Then only the expected files are present on the persistence partition on USB drive "__internal"
Scenario: Deleting a Tails 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
And I log in to a new session
Then Tails is running from USB drive "current"
Then Tails is running from USB drive "__internal"
And the boot device has safe access rights
And persistence is disabled
But a Tails persistence partition exists on USB drive "current"
But a Tails persistence partition exists on USB drive "__internal"
And all notifications have disappeared
When I delete the persistent partition
Then there is no persistence partition on USB drive "current"
Then there is no persistence partition on USB drive "__internal"
......@@ -108,7 +108,7 @@ Feature: Chatting anonymously using Pidgin
# And I take note of the OTR key for Pidgin's "irc.oftc.net" account
And I shutdown Tails and wait for the computer to power off
Given a computer
And I start Tails from USB drive "current" and I login with persistence enabled
And I start Tails from USB drive "__internal" and I login with persistence enabled
And Pidgin has the expected persistent accounts configured
# And Pidgin has the expected persistent OTR keys
When I start Pidgin through the GNOME menu
......
......@@ -101,16 +101,16 @@ def checkpoints
:description => "I have started Tails without network from a USB drive without a persistent partition and stopped at Tails Greeter's login screen",
:parent_checkpoint => 'no-network-logged-in',
:steps => [
'I create a 4 GiB disk named "current"',
'I plug USB drive "current"',
'I "Clone & Install" Tails to USB drive "current"',
'the running Tails is installed on USB drive "current"',
'there is no persistence partition on USB drive "current"',
'I create a 4 GiB disk named "__internal"',
'I plug USB drive "__internal"',
'I "Clone & Install" Tails to USB drive "__internal"',
'the running Tails is installed on USB drive "__internal"',
'there is no persistence partition on USB drive "__internal"',
'I shutdown Tails and wait for the computer to power off',
'I start Tails from USB drive "current" with network unplugged',
'I start Tails from USB drive "__internal" with network unplugged',
'the boot device has safe access rights',
'Tails is running from USB drive "current"',
'there is no persistence partition on USB drive "current"',
'Tails is running from USB drive "__internal"',
'there is no persistence partition on USB drive "__internal"',
'process "udev-watchdog" is running',
'udev-watchdog is monitoring the correct device',
],
......@@ -123,11 +123,11 @@ def checkpoints
'I log in to a new session',
'the Tails desktop is ready',
'I create a persistent partition',
'a Tails persistence partition exists on USB drive "current"',
'a Tails persistence partition exists on USB drive "__internal"',
'I shutdown Tails and wait for the computer to power off',
'I start Tails from USB drive "current" with network unplugged',
'I start Tails from USB drive "__internal" with network unplugged',
'the boot device has safe access rights',
'Tails is running from USB drive "current"',
'Tails is running from USB drive "__internal"',
'process "udev-watchdog" is running',
'udev-watchdog is monitoring the correct device',
],
......
......@@ -54,11 +54,11 @@ Feature: Using Totem
# 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 enabled
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
And I start Tails from USB drive "current" with network unplugged and I login with persistence enabled
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
......
......@@ -44,7 +44,7 @@ Feature: Installing Tails to a USB drive
And I log in to a new session
Then Tails seems to have booted normally
When I create a persistent partition
Then a Tails persistence partition exists on USB drive "current"
Then a Tails persistence partition exists on USB drive "__internal"
#10720: Tails Installer freezes on Jenkins
@fragile
......@@ -52,9 +52,9 @@ Feature: Installing Tails to a USB drive
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
Then Tails seems to have booted normally
And Tails is running from USB drive "current"
And Tails is running from USB drive "__internal"
And the persistent Tor Browser directory does not exist
And there is no persistence partition on USB drive "current"
And there is no persistence partition on USB drive "__internal"
#10720: Tails Installer freezes on Jenkins
@fragile
......@@ -62,9 +62,9 @@ Feature: Installing Tails to a USB drive
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
Given the computer is set to boot in UEFI mode
When I start Tails from USB drive "current" with network unplugged and I login
When I start Tails from USB drive "__internal" with network unplugged and I login
Then the boot device has safe access rights
And Tails is running from USB drive "current"
And Tails is running from USB drive "__internal"
And the boot device has safe access rights
And Tails has started in UEFI mode
......
......@@ -119,7 +119,7 @@ Feature: Upgrading an old Tails USB installation
When I "Clone & Upgrade" Tails to USB drive "to_upgrade"
Then the running Tails is installed on USB drive "to_upgrade"
And I unplug USB drive "to_upgrade"
And I unplug USB drive "current"
And I unplug USB drive "__internal"
# Depends on scenario: Upgrading an old Tails USB installation from another Tails USB drive
Scenario: Booting Tails from a USB drive upgraded from USB with persistence enabled
......
Markdown is supported
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