Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-http-proxy
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 16 Apr 2007 20:17:39 -0300
changeset 4359 2e3c54fb79a3
parent 3012 fa4229c60dd7
child 5384 e3a0c092b4e2
permissions -rwxr-xr-x
actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2337
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
#!/bin/sh
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 












3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     3


hg init a













3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     4


cd a













3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     5


echo a > a













3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     6


hg ci -Ama -d '1123456789 0'








2622






064aef9162cc
rename stream hgrc option to compressed.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2621

diff
changeset




     7


hg --config server.uncompressed=True serve -p 20059 -d --pid-file=hg.pid








2570






83cfd95eafb5
tests: add timeouts, make run-tests.py clean up dead daemon processes



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2542

diff
changeset




     8


cat hg.pid >> $DAEMON_PIDS








2337






3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     9














3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    10


cd ..








2570






83cfd95eafb5
tests: add timeouts, make run-tests.py clean up dead daemon processes



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2542

diff
changeset




    11


("$TESTDIR/tinyproxy.py" 20060 localhost >proxy.log 2>&1 </dev/null &








2337






3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    12


echo $! > proxy.pid)








2570






83cfd95eafb5
tests: add timeouts, make run-tests.py clean up dead daemon processes



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2542

diff
changeset




    13


cat proxy.pid >> $DAEMON_PIDS








2337






3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    14


sleep 2













3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    15









2612






ffb895f16925
add support for streaming clone.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2570

diff
changeset




    16


echo %% url for proxy, stream








2621






5a5852a417b1
clone: disable stream support on server side by default.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2613

diff
changeset




    17


http_proxy=http://localhost:20060/ hg --config http_proxy.always=True clone --uncompressed http://localhost:20059/ b | \








3012






fa4229c60dd7
Allow for MB/sec transfer rates in test-http-proxy and test-ssh.



Lee Cantey <lcantey@gmail.com>


parents: 
2622

diff
changeset




    18


  sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'








2612






ffb895f16925
add support for streaming clone.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2570

diff
changeset




    19


cd b













ffb895f16925
add support for streaming clone.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2570

diff
changeset




    20


hg verify













ffb895f16925
add support for streaming clone.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2570

diff
changeset




    21


cd ..













ffb895f16925
add support for streaming clone.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2570

diff
changeset




    22














ffb895f16925
add support for streaming clone.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2570

diff
changeset




    23


echo %% url for proxy, pull








2613






479e26afa10f
clone: do not make streaming default. add --stream option instead.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2612

diff
changeset




    24


http_proxy=http://localhost:20060/ hg --config http_proxy.always=True clone http://localhost:20059/ b-pull








2612






ffb895f16925
add support for streaming clone.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2570

diff
changeset




    25


cd b-pull













ffb895f16925
add support for streaming clone.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2570

diff
changeset




    26


hg verify













ffb895f16925
add support for streaming clone.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2570

diff
changeset




    27


cd ..








2337






3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    28














3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    29


echo %% host:port for proxy








2613






479e26afa10f
clone: do not make streaming default. add --stream option instead.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2612

diff
changeset




    30


http_proxy=localhost:20060 hg clone --config http_proxy.always=True http://localhost:20059/ c








2337






3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    31














3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    32


echo %% proxy url with user name and password








2613






479e26afa10f
clone: do not make streaming default. add --stream option instead.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2612

diff
changeset




    33


http_proxy=http://user:passwd@localhost:20060 hg clone --config http_proxy.always=True http://localhost:20059/ d








2337






3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    34














3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    35


echo %% url with user name and password








2613






479e26afa10f
clone: do not make streaming default. add --stream option instead.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 
2612

diff
changeset




    36


http_proxy=http://user:passwd@localhost:20060 hg clone --config http_proxy.always=True http://user:passwd@localhost:20059/ e








2337






3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    37














3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    38


echo %% bad host:port for proxy













3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    39


http_proxy=localhost:20061 hg clone --config http_proxy.always=True http://localhost:20059/ f













3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    40














3f24bc5dee81
http: fix many problems with url parsing and auth. added proxy test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    41


exit 0















mercurial-crew-with-dirclash