From f7d4bc69ced31d395f565a26ba58c1cc58bf3b44 Mon Sep 17 00:00:00 2001
From: Garret Raziel <boloomka@gmail.com>
Date: Fri, 10 Apr 2015 10:38:28 +0200
Subject: [PATCH] changes to solve 173 and 167

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D335
---
 needles/boot_enter_passphrase2.json |  18 ++++++++++++++++++
 needles/boot_enter_passphrase2.png  | Bin 0 -> 17388 bytes
 tests/_software_selection.pm        |   6 +++---
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 needles/boot_enter_passphrase2.json
 create mode 100644 needles/boot_enter_passphrase2.png

diff --git a/needles/boot_enter_passphrase2.json b/needles/boot_enter_passphrase2.json
new file mode 100644
index 00000000..6fcd7450
--- /dev/null
+++ b/needles/boot_enter_passphrase2.json
@@ -0,0 +1,18 @@
+{
+  "tags": [
+    "boot_enter_passphrase",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-OFW-1",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 0,
+      "ypos": 361,
+      "width": 188,
+      "height": 31,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/boot_enter_passphrase2.png b/needles/boot_enter_passphrase2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3930b5a957807042e3812359c5093322fba5984
GIT binary patch
literal 17388
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
WkJ$Mhn*53fw0&E7iDK)%cm4zB9c0G<

literal 0
HcmV?d00001

diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index ca70e60e..1b0e78d2 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -3,14 +3,14 @@ use strict;
 use testapi;
 
 sub run {
+    # Anaconda hub
+    assert_screen "anaconda_main_hub", 300; #
+
     # Select package set. Minimal is the default, if 'default' is specified, skip selection.
     my $packageset = get_var('PACKAGE_SET', 'minimal');
     if ($packageset eq 'default') {
         return
     }
-    
-    # Anaconda hub
-    assert_screen "anaconda_main_hub", 300; #
 
     assert_and_click "anaconda_main_hub_select_packages";