Allow for MB/sec transfer rates in test-http-proxy and test-ssh.
Also make the test more specific in test-http.
--- a/tests/test-http
+++ b/tests/test-http
@@ -11,7 +11,7 @@ cat hg1.pid hg2.pid >> $DAEMON_PIDS
echo % clone via stream
http_proxy= hg clone --uncompressed http://localhost:20059/ copy 2>&1 | \
- sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/.\(B\/sec\)/X\1/'
+ sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
hg verify -R copy
echo % try to clone via stream, should use pull instead
--- a/tests/test-http-proxy
+++ b/tests/test-http-proxy
@@ -15,7 +15,7 @@ sleep 2
echo %% url for proxy, stream
http_proxy=http://localhost:20060/ hg --config http_proxy.always=True clone --uncompressed http://localhost:20059/ b | \
- sed -e 's/[0-9][0-9.]*/XXX/g'
+ sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
cd b
hg verify
cd ..
--- a/tests/test-http-proxy.out
+++ b/tests/test-http-proxy.out
@@ -2,7 +2,7 @@ adding a
%% url for proxy, stream
streaming all changes
XXX files to transfer, XXX bytes of data
-transferred XXX bytes in XXX seconds (XXX KB/sec)
+transferred XXX bytes in XXX seconds (XXX XB/sec)
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
checking changesets
checking manifests
--- a/tests/test-ssh
+++ b/tests/test-ssh
@@ -38,7 +38,7 @@ cd ..
echo "# clone remote via stream"
hg clone -e ./dummyssh --uncompressed ssh://user@dummy/remote local-stream 2>&1 | \
- sed -e 's/[0-9][0-9.]*/XXX/g'
+ sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
cd local-stream
hg verify
cd ..
--- a/tests/test-ssh.out
+++ b/tests/test-ssh.out
@@ -2,7 +2,7 @@
# clone remote via stream
streaming all changes
XXX files to transfer, XXX bytes of data
-transferred XXX bytes in XXX seconds (XXX KB/sec)
+transferred XXX bytes in XXX seconds (XXX XB/sec)
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
checking changesets
checking manifests