From 4103021630b260b63cb16612e1bf67f41b36f1a8 Mon Sep 17 00:00:00 2001
From: mkravec <mkravec@suse.com>
Date: Wed, 13 Jul 2016 14:23:38 +0200
Subject: [PATCH] Confirm autoyast creation is removed from installation
 overview Resolves poo#11442

---
 products/sle/main.pm                        |  3 +++
 tests/console/autoyast_removed.pm           | 21 +++++++++++++++++++++
 tests/installation/installation_overview.pm | 14 ++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 tests/console/autoyast_removed.pm

diff --git a/products/sle/main.pm b/products/sle/main.pm
index 2d7bdf582343..9a3decdd8e60 100644
--- a/products/sle/main.pm
+++ b/products/sle/main.pm
@@ -641,6 +641,9 @@ sub load_extra_test () {
     if (!get_var("OFW") && !is_jeos()) {
         loadtest "console/aplay.pm";
     }
+    if (get_var("SP2ORLATER")) {
+        loadtest "console/autoyast_removed.pm";
+    }
     if (get_var("FILESYSTEM", "btrfs") eq "btrfs") {
         loadtest "console/btrfs_autocompletion.pm";
     }
diff --git a/tests/console/autoyast_removed.pm b/tests/console/autoyast_removed.pm
new file mode 100644
index 000000000000..9a02149fff45
--- /dev/null
+++ b/tests/console/autoyast_removed.pm
@@ -0,0 +1,21 @@
+# SUSE's openQA tests
+#
+# Copyright © 2016 SUSE LLC
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+
+use base "consoletest";
+use strict;
+use testapi;
+
+sub run() {
+    select_console("root-console");
+	# Check autoyast has been removed in SP2 (fate#317970)
+    assert_script_run("[ ! -f /root/autoinst.xml ]");
+}
+
+1;
+# vim: set sw=4 et:
diff --git a/tests/installation/installation_overview.pm b/tests/installation/installation_overview.pm
index 7d4d2f0a17e4..71cbcccca864 100644
--- a/tests/installation/installation_overview.pm
+++ b/tests/installation/installation_overview.pm
@@ -26,6 +26,20 @@ sub run() {
     # preserve it for the video
     wait_idle 10;
 
+    # Check autoyast has been removed in SP2 (fate#317970)
+    if (get_var("SP2ORLATER")) {
+        if (check_var('VIDEOMODE', 'text')) {
+            send_key 'alt-l';
+            send_key 'ret';
+            send_key 'tab';
+        }
+        else {
+            send_key_until_needlematch 'packages-section-selected', 'tab';
+        }
+        send_key 'end';
+        assert_screen 'autoyast_removed';
+    }
+
     # check for dependency issues, if found, drill down to software selection, take a screenshot, then die
     if (check_screen("inst-overview-dep-warning", 1)) {
         record_soft_failure 'dependency warning';