From c9356ee19603d3c6ac0ac1a39a7a381a6c224054 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 20 Aug 2021 14:50:40 -0700
Subject: [PATCH] Update _check_install_source for NFS addrepo on F35

We need the same alternate check method logic for NFS addrepo on
F35 now we're testing F35 updates. This is all getting a bit
messy and could maybe stand a refactor at some point...

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 tests/_check_install_source.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/_check_install_source.pm b/tests/_check_install_source.pm
index ae51c70f..7d40f61b 100644
--- a/tests/_check_install_source.pm
+++ b/tests/_check_install_source.pm
@@ -28,8 +28,12 @@ sub run {
             assert_script_run 'grep "repo addrepo.*' . ${addrepourl} . '" /tmp/packaging.log';
             # ...this line tells us it added the repo called 'addrepo'...
             assert_script_run 'grep "\(added\|enabled\) repo: .addrepo." /tmp/packaging.log';
-            # ...and this line tells us it worked (I hope)
-            assert_script_run 'grep "enabled repo.*nfs" /tmp/packaging.log';
+            # ...and one of these tells us it worked (I hope). This one is <F35...
+            if (script_run 'grep "enabled repo.*nfs" /tmp/packaging.log') {
+                # ...these are F35+
+                assert_script_run 'grep "Load metadata for the ' . "'addrepo'" . '" /tmp/anaconda.log';
+                assert_script_run 'grep "Loaded metadata from.*file:///run/install/addrepo.nfs" /tmp/anaconda.log';
+            }
         }
     }
     if ($repourl =~ /^hd:/) {