From 0e18c0fc4f8aadb3022e93e12299a926b9698aea Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 7 Nov 2017 13:04:01 -0800
Subject: [PATCH] Never load graphical post-install tests on Modularity for now

Current Modular composes don't include any graphical desktop
bits, so they're never going to want to do this. (This makes
sense for e.g. non-English install tests; we still want to
make sure Russian install works on Modular composes, we just
have to skip the post-install graphical input testing).
---
 main.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/main.pm b/main.pm
index 9b01a48a..81b3e80b 100644
--- a/main.pm
+++ b/main.pm
@@ -217,6 +217,13 @@ sub _load_early_postinstall_tests {
         _load_instance("tests/disk_guided_encrypted_postinstall", $instance);
     }
 
+    # For now, there's no possibility to get a graphical desktop on
+    # Modular composes, so short-circuit here for those
+    if (get_var("MODULAR")) {
+        _load_instance("tests/_console_wait_login", $instance);
+        return;
+    }
+
     # Appropriate login method for install type
     if (get_var("DESKTOP")) {
         _load_instance("tests/_graphical_wait_login", $instance);