From 9aa83cffd1702b61552ef4c13359fc014f22518d Mon Sep 17 00:00:00 2001 From: Michel Normand Date: Wed, 1 Mar 2017 04:59:37 -0500 Subject: [PATCH] support nfsvers=x parameter as nfs option Required to validate bypass for pending bug https://bugzilla.redhat.com/show_bug.cgi?id=1386059 Signed-off-by: Michel Normand --- tests/_check_install_source.pm | 3 ++- tests/install_source_graphical.pm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/_check_install_source.pm b/tests/_check_install_source.pm index cdabbd73..5afde7e7 100644 --- a/tests/_check_install_source.pm +++ b/tests/_check_install_source.pm @@ -17,8 +17,9 @@ sub run { # check that the repo was used $self->root_console; if ($repourl =~ s/^nfs://) { + $repourl =~ s/^nfsvers=.://; # the above both checks if we're dealing with an NFS URL, and - # strips the 'nfs:' from it if so + # 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"; } diff --git a/tests/install_source_graphical.pm b/tests/install_source_graphical.pm index a3ec27ba..4e7e9ecd 100644 --- a/tests/install_source_graphical.pm +++ b/tests/install_source_graphical.pm @@ -49,8 +49,9 @@ sub run { } elsif (get_var("REPOSITORY_GRAPHICAL")) { $repourl = get_full_repo(get_var("REPOSITORY_GRAPHICAL")); - # strip the 'nfs:' for typing here + # strip the nfs and nfsvers prefix if present for typing here $repourl =~ s/^nfs://; + $repourl =~ s/^nfsvers=.://; type_safely $repourl; }