Oops! Manual edits to broken tests

Commit 2 of 2: there were (still are?) a bunch of string
checks that didn't have a corresponding Expect(). IIUC
that means they were NOPs. Try to identify and fix those.

The first few were caught by Go linting, "ok is defined
but not used". When I realized the problem, I looked for
more using:

    $ ack -A2 LineInOutputStartsWith

...and tediously eyeballing the results, looking for
matches in which the next line was not Expect(). If
test was wrong (e.g. "server" should've been "nameserver"),
fix that.

Also: remove the remove-betrue script. We don't need it
in the repo, I just wanted to preserve it for posterity.

Signed-off-by: Ed Santiago <santiago@redhat.com>

1 files changed, 0 insertions, 48 deletions

diff --git a/test/e2e/remove-betrue b/test/e2e/remove-betrue
deleted file mode 100755
index dd56ca818..000000000
--- a/test/e2e/remove-betrue
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/perl
-#
-# one-shot script for #12387
-#
-use warnings;
-use strict;
-use File::Basename      qw(dirname);
-
-chdir(dirname($0));
-
-for my $f (glob('*_test.go')) {
-    my ($indent, $okvar, $sessionvar, $s);
-    my $prev = '';
-
-    open my $fh_in, '<', $f or die;
-    open my $fh_out, '>', "$f.tmp.$$" or die;
-    while (<$fh_in>) {
-        if (/^(\s+)(\S+),\s+_\s+:?=\s+(\S+)\.GrepString\((.*)\)/) {
-            print { $fh_out } $prev;
-            $prev = $_;
-            ($indent, $okvar, $sessionvar, $s) = ($1, $2, $3, $4);
-            next;
-        }
-        elsif ($okvar && /^\s+Expect\($okvar\)\.(Should|To)\(BeTrue\(\)\)\s*$/) {
-            print { $fh_out} $indent, "Expect($sessionvar.OutputToString()).To(ContainSubstring($s))\n";
-            $okvar = $sessionvar = $s = $prev = '';
-            next;
-        }
-        else {
-            print { $fh_out } $prev;
-            $prev = $_;
-            $okvar = $sessionvar = $s = '';
-
-            # Handle other common cases
-            $prev =~ s{
-^ (\s+)          Expect\((\S+)\.LineInOutputContains\((.*?)\)\)\.To\(BeTrue\(\)\)
-                  }{${1}Expect($2.OutputToString()).To(ContainSubstring($3))}xx;
-
-            $prev =~ s{
-^ (\s+)          Expect\((\S+)\.LineInOutputStartsWith\((.*)\)\)\.To\(BeTrue\(\)\)
-                  }{${1}Expect($2.OutputToStringArray()).To(ContainElement(HavePrefix($3)))}xx;
-
-        }
-    }
-    print { $fh_out } $prev;
-    close $fh_out or die;
-    rename "$f.tmp.$$" => "$f" or die;
-}