From 37e2f134f1b867284a4f240c0ce45105dd40f259 Mon Sep 17 00:00:00 2001
From: Michel Normand <normand@linux.vnet.ibm.com>
Date: Thu, 21 Mar 2019 10:22:35 +0100
Subject: [PATCH] Bypass dup chars after snapshot brc#1691487

eg failing jobs:
https://openqa.stg.fedoraproject.org/tests/499908#step/_boot_to_anaconda/7
https://openqa.stg.fedoraproject.org/tests/519326#step/_post_network_static/4

Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
 lib/utils.pm                       | 9 ++++++++-
 tests/_post_network_static.pm      | 1 +
 tests/_setup_browser.pm            | 1 +
 tests/base_selinux.pm              | 2 ++
 tests/realmd_join_cockpit.pm       | 1 +
 tests/realmd_join_sssd.pm          | 1 +
 tests/server_cockpit_basic.pm      | 1 +
 tests/server_filesystem_default.pm | 2 ++
 8 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/utils.pm b/lib/utils.pm
index 172d984e..cb9682a9 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -7,7 +7,7 @@ use Exporter;
 
 use lockapi;
 use testapi;
-our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout desktop_switch_layout console_loadkeys_us do_bootloader boot_decrypt check_release menu_launch_type start_cockpit repo_setup gnome_initial_setup anaconda_create_user check_desktop_clean download_modularity_tests quit_firefox advisory_get_installed_packages advisory_check_nonmatching_packages start_with_launcher quit_with_shortcut disable_firefox_studies select_rescue_mode copy_devcdrom_as_isofile/;
+our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout desktop_switch_layout console_loadkeys_us do_bootloader boot_decrypt check_release menu_launch_type start_cockpit repo_setup gnome_initial_setup anaconda_create_user check_desktop_clean download_modularity_tests quit_firefox advisory_get_installed_packages advisory_check_nonmatching_packages start_with_launcher quit_with_shortcut disable_firefox_studies select_rescue_mode copy_devcdrom_as_isofile bypass_1691487/;
 
 sub run_with_error_check {
     my ($func, $error_screen) = @_;
@@ -917,3 +917,10 @@ sha256sum -c /tmp/x
 EOF
     assert_script_run($_) foreach (split /\n/, $cmd);
 }
+
+sub bypass_1691487 {
+    if (script_run 'echo "expected command supposed to be typed without error."') {
+        record_soft_failure 'brc#1691487 bypass';
+        script_run 'echo "trial bypass dup chars brc#1691487"';
+    }
+}
diff --git a/tests/_post_network_static.pm b/tests/_post_network_static.pm
index 8213e227..387d201a 100644
--- a/tests/_post_network_static.pm
+++ b/tests/_post_network_static.pm
@@ -8,6 +8,7 @@ sub run {
     my $self = shift;
     my ($ip, $hostname) = split(/ /, get_var("POST_STATIC"));
     $hostname //= 'localhost.localdomain';
+    bypass_1691487;
     # set up networking
     setup_tap_static($ip, $hostname);
 }
diff --git a/tests/_setup_browser.pm b/tests/_setup_browser.pm
index c3262350..a7d04bee 100644
--- a/tests/_setup_browser.pm
+++ b/tests/_setup_browser.pm
@@ -5,6 +5,7 @@ use utils;
 
 sub run {
     my $self = shift;
+    bypass_1691487;
     # set up appropriate repositories
     repo_setup();
     # use --enablerepo=fedora for Modular compose testing (we need to
diff --git a/tests/base_selinux.pm b/tests/base_selinux.pm
index 5337ee48..dcff4497 100644
--- a/tests/base_selinux.pm
+++ b/tests/base_selinux.pm
@@ -1,9 +1,11 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
     my $self=shift;
+    bypass_1691487;
     # switch to TTY3 for both, graphical and console tests
     $self->root_console(tty=>3);
     validate_script_output 'getenforce', sub { $_ =~ m/Enforcing/ };
diff --git a/tests/realmd_join_cockpit.pm b/tests/realmd_join_cockpit.pm
index 70e1fb82..2a3fe1ce 100644
--- a/tests/realmd_join_cockpit.pm
+++ b/tests/realmd_join_cockpit.pm
@@ -8,6 +8,7 @@ use tapnet;
 sub run {
     my $self = shift;
     # use FreeIPA server as DNS server
+    bypass_1691487;
     assert_script_run "printf 'search domain.local\nnameserver 10.0.2.100' > /etc/resolv.conf";
     # wait for the server to be ready (do it now just to make sure name
     # resolution is working before we proceed)
diff --git a/tests/realmd_join_sssd.pm b/tests/realmd_join_sssd.pm
index cb12b12c..785687b1 100644
--- a/tests/realmd_join_sssd.pm
+++ b/tests/realmd_join_sssd.pm
@@ -21,6 +21,7 @@ sub run {
         $server_ip = '10.0.2.107';
         $server_mutex = 'replica_ready';
     }
+    bypass_1691487;
     assert_script_run "printf 'search domain.local\nnameserver ${server_ip}' > /etc/resolv.conf";
     assert_script_run "sed -i -e '/^DNS.*/d' /etc/sysconfig/network-scripts/ifcfg-eth0";
     assert_script_run "printf '\nDNS1=${server_ip}\n' >> /etc/sysconfig/network-scripts/ifcfg-eth0";
diff --git a/tests/server_cockpit_basic.pm b/tests/server_cockpit_basic.pm
index a7250578..359de365 100644
--- a/tests/server_cockpit_basic.pm
+++ b/tests/server_cockpit_basic.pm
@@ -5,6 +5,7 @@ use utils;
 
 sub run {
     my $self=shift;
+    bypass_1691487;
     # run firefox and login to cockpit
     start_cockpit(1);
     # go to the logs screen
diff --git a/tests/server_filesystem_default.pm b/tests/server_filesystem_default.pm
index ac01cd53..0812deb1 100644
--- a/tests/server_filesystem_default.pm
+++ b/tests/server_filesystem_default.pm
@@ -1,9 +1,11 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
     my $self = shift;
+    bypass_1691487;
     # check / is xfs, as it should be on server
     assert_script_run 'findmnt -M / -o FSTYPE | grep xfs';
 }