tests: followup on network related errors on Debian 9

First, update test-clonebundles.t which was failing since the introduction of
the `$EADDRNOTAVAIL$` common pattern.

Also update two tests from 8695fbe17f7c with a more compact condition line.

Differential Revision: https://phab.mercurial-scm.org/D5445

tests/test-clonebundles.t

@@ -64,7 +64,7 b' Server is not running aborts'
   $ echo "http://localhost:$HGPORT1/bundle.hg" > server/.hg/clonebundles.manifest
   $ hg clone http://localhost:$HGPORT server-not-runner
   applying clone bundle from http://localhost:$HGPORT1/bundle.hg
-  error fetching bundle: (.* refused.*|Protocol not supported|(.* )?Cannot assign requested address) (re)
+  error fetching bundle: (.* refused.*|Protocol not supported|(.* )?\$EADDRNOTAVAIL\$) (re)
   abort: error applying bundle
   (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false")
   [255]

tests/test-http-bad-server.t

@@ -38,8 +38,7 b' Failure to accept() socket should result'
   $ cat hg.pid > $DAEMON_PIDS
 
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: $ECONNRESET$ (?)
-  abort: error: $EADDRNOTAVAIL$ (?)
+  abort: error: (\$ECONNRESET\$|\$EADDRNOTAVAIL\$) (re)
   [255]
 
 (The server exits on its own, but there is a race between that and starting a new server.

tests/test-http-proxy.t

@@ -90,8 +90,7 b' bad host:port for proxy ("Protocol not s'
 misconfigured hosts)
 
   $ http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f
-  abort: error: (Connection refused|Protocol not supported|.* actively refused it) (re) (?)
-  abort: error: $EADDRNOTAVAIL$ (?)
+  abort: error: (Connection refused|Protocol not supported|.* actively refused it|\$EADDRNOTAVAIL\$) (re)
   [255]
 
 do not use the proxy if it is in the no list