Test suite: move upgrade scenarios to the feature dedicated to them.

features/usb_install.feature

@@ -3,44 +3,6 @@ Feature: Installing Tails to a USB drive
   As a Tails user
   I want to install Tails to a suitable USB drive
 
-  Scenario: Try to "Upgrade from ISO" Tails to a pristine USB drive
-    Given a computer
-    And I setup a filesystem share containing the Tails ISO
-    And I start Tails from DVD with network unplugged and I login
-    And I temporarily create a 4 GiB disk named "pristine"
-    And I plug USB drive "pristine"
-    And I start Tails Installer in "Upgrade from ISO" mode
-    Then a suitable USB device is not found
-    And I am told that the destination device cannot be upgraded
-
-  Scenario: Try to "Clone & Upgrade" 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 "pristine"
-    And I plug USB drive "pristine"
-    And I start Tails Installer in "Clone & Upgrade" mode
-    Then a suitable USB device is not found
-    And I am told that the destination device cannot be upgraded
-
-  Scenario: Try to "Upgrade from ISO" Tails to a USB drive with GPT and a FAT partition
-    Given a computer
-    And I setup a filesystem share containing the Tails ISO
-    And I start Tails from DVD with network unplugged and I login
-    And I temporarily create a 4 GiB disk named "gptfat"
-    And I create a gpt partition with a vfat filesystem on disk "gptfat"
-    And I plug USB drive "gptfat"
-    And I start Tails Installer in "Upgrade from ISO" mode
-    Then a suitable USB device is not found
-    And I am told that the destination device cannot be upgraded
-
-  Scenario: Try to "Clone & Upgrade" Tails to a USB drive with GPT and a FAT partition
-    Given I have started Tails from DVD without network and logged in
-    And I temporarily create a 4 GiB disk named "gptfat"
-    And I create a gpt partition with a vfat filesystem on disk "gptfat"
-    And I plug USB drive "gptfat"
-    And I start Tails Installer in "Upgrade from ISO" mode
-    Then a suitable USB device is not found
-    And I am told that the destination device cannot be upgraded
-
   Scenario: Try installing Tails to a too small USB drive
     Given I have started Tails from DVD without network and logged in
     And I temporarily create a 2 GiB disk named "too-small-device"

features/usb_upgrade.feature

@@ -10,6 +10,44 @@ Feature: Upgrading an old Tails USB installation
   # other. When editing this feature, make sure you understand these
   # dependencies (which are documented below).
 
+  Scenario: Try to "Upgrade from ISO" Tails to a pristine USB drive
+    Given a computer
+    And I setup a filesystem share containing the Tails ISO
+    And I start Tails from DVD with network unplugged and I login
+    And I temporarily create a 4 GiB disk named "pristine"
+    And I plug USB drive "pristine"
+    And I start Tails Installer in "Upgrade from ISO" mode
+    Then a suitable USB device is not found
+    And I am told that the destination device cannot be upgraded
+
+  Scenario: Try to "Clone & Upgrade" 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 "pristine"
+    And I plug USB drive "pristine"
+    And I start Tails Installer in "Clone & Upgrade" mode
+    Then a suitable USB device is not found
+    And I am told that the destination device cannot be upgraded
+
+  Scenario: Try to "Upgrade from ISO" Tails to a USB drive with GPT and a FAT partition
+    Given a computer
+    And I setup a filesystem share containing the Tails ISO
+    And I start Tails from DVD with network unplugged and I login
+    And I temporarily create a 4 GiB disk named "gptfat"
+    And I create a gpt partition with a vfat filesystem on disk "gptfat"
+    And I plug USB drive "gptfat"
+    And I start Tails Installer in "Upgrade from ISO" mode
+    Then a suitable USB device is not found
+    And I am told that the destination device cannot be upgraded
+
+  Scenario: Try to "Clone & Upgrade" Tails to a USB drive with GPT and a FAT partition
+    Given I have started Tails from DVD without network and logged in
+    And I temporarily create a 4 GiB disk named "gptfat"
+    And I create a gpt partition with a vfat filesystem on disk "gptfat"
+    And I plug USB drive "gptfat"
+    And I start Tails Installer in "Upgrade from ISO" mode
+    Then a suitable USB device is not found
+    And I am told that the destination device cannot be upgraded
+
   Scenario: Installing an old version of Tails to a pristine USB drive
     Given a computer
     And the computer is set to boot from the old Tails DVD