81-test_cmp_cli.t: Do connections to 127.0.0.1 (e.g., Mock server) without proxy
Fixes
@@ -249,12 +249,22 @@ sub load_tests {
$line =~ s{_PBM_PORT}{$pbm_port}g;
$line =~ s{_PBM_REF}{$pbm_ref}g;
$line =~ s{_PBM_SECRET}{$pbm_secret}g;
- my $noproxy = $line =~ m/,\s*-no_proxy\s*,(.*?)(,|$)/ ? $1 : $no_proxy;
- next LOOP if $no_proxy && ($noproxy =~ $server_host)
- && $line =~ m/,\s*-proxy\s*,/;
+
next LOOP if $server_tls == 0 && $line =~ m/,\s*-tls_used\s*,/;
- $line =~ s{-section,,}{-section,,-proxy,$proxy,} unless $line =~ m/,\s*-proxy\s*,/;
+ my $noproxy = $no_proxy;
+ if ($line =~ m/,\s*-no_proxy\s*,(.*?)(,|$)/) {
+ $noproxy = $1;
+ } elsif ($server_host eq "127.0.0.1") {
+ # do connections to localhost (e.g., Mock server) without proxy
+ $line =~ s{-section,,}{-section,,-no_proxy,127.0.0.1,} ;
+ }
+ if ($line =~ m/,\s*-proxy\s*,/) {
+ next LOOP if $no_proxy && ($noproxy =~ $server_host);
+ } else {
+ $line =~ s{-section,,}{-section,,-proxy,$proxy,};
+ }
$line =~ s{-section,,}{-config,../$test_config,-section,$server_name $aspect,};
+
my @fields = grep /\S/, split ",", $line;
s/^<EMPTY>$// for (@fields); # used for proxy=""
s/^\s+// for (@fields); # remove leading whitespace from elements
