diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
| commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
| tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /tests/test-http.t | |
| parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
| parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
| download | mercurial-tarball-4b0aa73b8c69bd5b7521337809f7bc4714209a5a.tar.gz | |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'tests/test-http.t')
| -rw-r--r-- | tests/test-http.t | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/tests/test-http.t b/tests/test-http.t index 6c3f6b4..eb9b7df 100644 --- a/tests/test-http.t +++ b/tests/test-http.t @@ -1,4 +1,3 @@ - $ "$TESTDIR/hghave" serve || exit 80 $ hg init test $ cd test @@ -17,15 +16,9 @@ Test server address cannot be reused -#if windows - $ hg serve -p $HGPORT1 2>&1 - abort: cannot start server at ':$HGPORT1': * (glob) - [255] -#else $ hg serve -p $HGPORT1 2>&1 abort: cannot start server at ':$HGPORT1': Address already in use [255] -#endif $ cd .. $ cat hg1.pid hg2.pid >> $DAEMON_PIDS @@ -99,7 +92,7 @@ pull $ cd copy-pull $ echo '[hooks]' >> .hg/hgrc - $ echo "changegroup = python \"$TESTDIR/printenv.py\" changegroup" >> .hg/hgrc + $ echo 'changegroup = python "$TESTDIR"/printenv.py changegroup' >> .hg/hgrc $ hg pull pulling from http://localhost:$HGPORT1/ searching for changes @@ -107,7 +100,7 @@ pull adding manifests adding file changes added 1 changesets with 1 changes to 1 files - changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost:$HGPORT1/ + changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost:$HGPORT1/ (run 'hg update' to get a working copy) $ cd .. @@ -118,7 +111,6 @@ clone from invalid URL [255] test http authentication -+ use the same server to test server side streaming preference $ cd test $ cat << EOT > userpass.py @@ -134,8 +126,7 @@ test http authentication > def extsetup(): > common.permhooks.insert(0, perform_authentication) > EOT - $ hg --config extensions.x=userpass.py serve -p $HGPORT2 -d --pid-file=pid \ - > --config server.preferuncompressed=True + $ hg --config extensions.x=userpass.py serve -p $HGPORT2 -d --pid-file=pid $ cat pid >> $DAEMON_PIDS $ hg id http://localhost:$HGPORT2/ @@ -157,13 +148,8 @@ test http authentication 5fed3813f7f5 $ hg id http://user@localhost:$HGPORT2/ 5fed3813f7f5 - $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1 - streaming all changes - 7 files to transfer, 916 bytes of data - transferred * bytes in * seconds (*/sec) (glob) - updating to branch default - 5 files updated, 0 files merged, 0 files removed, 0 files unresolved - + $ hg id http://user:pass@localhost:$HGPORT2/ + 5fed3813f7f5 $ hg id http://user2@localhost:$HGPORT2/ abort: http authorization required [255] @@ -176,10 +162,7 @@ test http authentication clone of serve with repo in root and unserved subrepo (issue2970) $ hg --cwd test init sub - $ echo empty > test/sub/empty - $ hg --cwd test/sub add empty - $ hg --cwd test/sub commit -qm 'add empty' - $ hg --cwd test/sub tag -r 0 something + $ hg --cwd test/sub tag something $ echo sub = sub > test/.hgsub $ hg --cwd test add .hgsub $ hg --cwd test commit -qm 'add subrepo' |