# HG changeset patch # User Kyle Lippincott # Date 2018-05-15 18:52:43 # Node ID 538e850ae73745c55bbb7da1ee3659c21a315688 # Parent 9d44c71bd892efb3a4407678d5bc77213861c159 tests: mark tests that fail when using chg as #require no-chg As far as I can tell, most of these failures are due to using $HGPORT, which it seems chg might be using itself? I don't know enough to debug these failures to fix them properly. Differential Revision: https://phab.mercurial-scm.org/D3562 diff --git a/tests/test-clone-uncompressed.t b/tests/test-clone-uncompressed.t --- a/tests/test-clone-uncompressed.t +++ b/tests/test-clone-uncompressed.t @@ -1,4 +1,4 @@ -#require serve no-reposimplestore +#require serve no-reposimplestore no-chg #testcases stream-legacy stream-bundle2 diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t --- a/tests/test-clonebundles.t +++ b/tests/test-clonebundles.t @@ -1,4 +1,4 @@ -#require no-reposimplestore +#require no-reposimplestore no-chg Set up a server diff --git a/tests/test-http-api-httpv2.t b/tests/test-http-api-httpv2.t --- a/tests/test-http-api-httpv2.t +++ b/tests/test-http-api-httpv2.t @@ -1,3 +1,5 @@ +#require no-chg + $ . $TESTDIR/wireprotohelpers.sh $ enabledummycommands diff --git a/tests/test-http-api.t b/tests/test-http-api.t --- a/tests/test-http-api.t +++ b/tests/test-http-api.t @@ -1,3 +1,5 @@ +#require no-chg + $ send() { > hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT/ > } diff --git a/tests/test-http-protocol.t b/tests/test-http-protocol.t --- a/tests/test-http-protocol.t +++ b/tests/test-http-protocol.t @@ -1,3 +1,5 @@ +#require no-chg + $ . $TESTDIR/wireprotohelpers.sh $ cat >> $HGRCPATH << EOF diff --git a/tests/test-lfs-largefiles.t b/tests/test-lfs-largefiles.t --- a/tests/test-lfs-largefiles.t +++ b/tests/test-lfs-largefiles.t @@ -1,4 +1,4 @@ -#require no-reposimplestore +#require no-reposimplestore no-chg This tests the interaction between the largefiles and lfs extensions, and conversion from largefiles -> lfs. diff --git a/tests/test-lfs-serve-access.t b/tests/test-lfs-serve-access.t --- a/tests/test-lfs-serve-access.t +++ b/tests/test-lfs-serve-access.t @@ -1,4 +1,4 @@ -#require serve no-reposimplestore +#require serve no-reposimplestore no-chg $ cat >> $HGRCPATH < [extensions] diff --git a/tests/test-lfs-serve.t b/tests/test-lfs-serve.t --- a/tests/test-lfs-serve.t +++ b/tests/test-lfs-serve.t @@ -1,5 +1,5 @@ #testcases lfsremote-on lfsremote-off -#require serve no-reposimplestore +#require serve no-reposimplestore no-chg This test splits `hg serve` with and without using the extension into separate tests cases. The tests are broken down as follows, where "LFS"/"No-LFS" diff --git a/tests/test-lfs-test-server.t b/tests/test-lfs-test-server.t --- a/tests/test-lfs-test-server.t +++ b/tests/test-lfs-test-server.t @@ -1,4 +1,4 @@ -#require no-reposimplestore +#require no-reposimplestore no-chg #testcases git-server hg-server #if git-server diff --git a/tests/test-lfs.t b/tests/test-lfs.t --- a/tests/test-lfs.t +++ b/tests/test-lfs.t @@ -1,4 +1,4 @@ -#require no-reposimplestore +#require no-reposimplestore no-chg # Initial setup diff --git a/tests/test-parseindex.t b/tests/test-parseindex.t --- a/tests/test-parseindex.t +++ b/tests/test-parseindex.t @@ -1,3 +1,5 @@ +#require no-chg + revlog.parseindex must be able to parse the index file even if an index entry is split between two 64k blocks. The ideal test would be to create an index file with inline data where diff --git a/tests/test-pull-bundle.t b/tests/test-pull-bundle.t --- a/tests/test-pull-bundle.t +++ b/tests/test-pull-bundle.t @@ -1,3 +1,5 @@ +#require no-chg + $ hg init repo $ cd repo $ echo foo > foo diff --git a/tests/test-push-http.t b/tests/test-push-http.t --- a/tests/test-push-http.t +++ b/tests/test-push-http.t @@ -1,3 +1,5 @@ +#require no-chg + #testcases bundle1 bundle2 #if bundle1 diff --git a/tests/test-ssh-proto.t b/tests/test-ssh-proto.t --- a/tests/test-ssh-proto.t +++ b/tests/test-ssh-proto.t @@ -1,3 +1,5 @@ +#require no-chg + $ cat > hgrc-sshv2 << EOF > %include $HGRCPATH > [experimental] diff --git a/tests/test-wireproto-command-capabilities.t b/tests/test-wireproto-command-capabilities.t --- a/tests/test-wireproto-command-capabilities.t +++ b/tests/test-wireproto-command-capabilities.t @@ -1,3 +1,5 @@ +#require no-chg + $ . $TESTDIR/wireprotohelpers.sh $ hg init server