From f3878c4380efdd2c6bdb7319afba90ba1e7bb089 Mon Sep 17 00:00:00 2001 From: Michel Normand Date: Thu, 24 Aug 2017 03:40:08 -0400 Subject: [PATCH] Change checking nfs mount for PowerPC by direct grep of mount command because nfs mounting not traced in ananconda or packaging log. Signed-off-by: Michel Normand --- tests/_check_install_source.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/_check_install_source.pm b/tests/_check_install_source.pm index 5afde7e7..a1099504 100644 --- a/tests/_check_install_source.pm +++ b/tests/_check_install_source.pm @@ -20,8 +20,14 @@ sub run { $repourl =~ s/^nfsvers=.://; # the above both checks if we're dealing with an NFS URL, and # strips the 'nfs:' and 'nfsvers=.:' from it if so - # message is in packaging.log up to F26, anaconda.log F27+ - assert_script_run "grep 'mounting ${repourl}' /tmp/packaging.log /tmp/anaconda.log"; + if (get_var("OFW")) { + # for PowerPC mounting info may be not in anaconda.log + assert_script_run "mount |grep nfs |grep '${repourl}'"; + } + else { + # message is in packaging.log up to F26, anaconda.log F27+ + assert_script_run "grep 'mounting ${repourl}' /tmp/packaging.log /tmp/anaconda.log"; + } } else { assert_script_run "grep \"added repo: 'anaconda'.*${repourl}\" /tmp/packaging.log";