tests: disable tests for advanced clone features with simple store
There are a handful of test failures in the simple store with
regards to stream clones. Fixing them will require a lot of
conditional output. Disabling the tests wholesale is easier
at this juncture.
Differential Revision: https://phab.mercurial-scm.org/D3064
--- a/tests/test-clone-uncompressed.t Tue Apr 03 14:24:14 2018 -0700
+++ b/tests/test-clone-uncompressed.t Tue Apr 03 15:08:14 2018 -0700
@@ -1,4 +1,4 @@
-#require serve
+#require serve no-reposimplestore
#testcases stream-legacy stream-bundle2
--- a/tests/test-clonebundles.t Tue Apr 03 14:24:14 2018 -0700
+++ b/tests/test-clonebundles.t Tue Apr 03 15:08:14 2018 -0700
@@ -1,3 +1,5 @@
+#require no-reposimplestore
+
Set up a server
$ hg init server
--- a/tests/test-http-bundle1.t Tue Apr 03 14:24:14 2018 -0700
+++ b/tests/test-http-bundle1.t Tue Apr 03 15:08:14 2018 -0700
@@ -35,6 +35,7 @@
clone via stream
+#if no-reposimplestore
$ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
streaming all changes
6 files to transfer, 606 bytes of data
@@ -49,6 +50,7 @@
crosschecking files in changesets and manifests
checking files
4 files, 1 changesets, 4 total revisions
+#endif
try to clone via stream, should use pull instead
@@ -223,6 +225,8 @@
5fed3813f7f5
$ hg id http://user@localhost:$HGPORT2/
5fed3813f7f5
+
+#if no-reposimplestore
$ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
streaming all changes
7 files to transfer, 916 bytes of data
@@ -231,7 +235,10 @@
no changes found
updating to branch default
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
+#endif
+
--pull should override server's preferuncompressed
+
$ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
requesting all changes
adding changesets
@@ -249,8 +256,8 @@
abort: HTTP Error 403: no
[255]
- $ hg -R dest tag -r tip top
- $ hg -R dest push http://user:pass@localhost:$HGPORT2/
+ $ hg -R dest-pull tag -r tip top
+ $ hg -R dest-pull push http://user:pass@localhost:$HGPORT2/
pushing to http://user:***@localhost:$HGPORT2/
searching for changes
remote: adding changesets
@@ -287,16 +294,16 @@
"GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=capabilities HTTP/1.1" 401 -
- "GET /?cmd=capabilities HTTP/1.1" 200 -
- "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=capabilities HTTP/1.1" 401 -
- "GET /?cmd=capabilities HTTP/1.1" 200 -
- "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+ "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
+ "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
+ "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
+ "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
+ "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
+ "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
+ "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
+ "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
+ "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
+ "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
"GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
--- a/tests/test-http.t Tue Apr 03 14:24:14 2018 -0700
+++ b/tests/test-http.t Tue Apr 03 15:08:14 2018 -0700
@@ -26,6 +26,7 @@
clone via stream
+#if no-reposimplestore
$ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
streaming all changes
6 files to transfer, 606 bytes of data
@@ -40,6 +41,7 @@
crosschecking files in changesets and manifests
checking files
4 files, 1 changesets, 4 total revisions
+#endif
try to clone via stream, should use pull instead
@@ -213,6 +215,8 @@
5fed3813f7f5
$ hg id http://user@localhost:$HGPORT2/
5fed3813f7f5
+
+#if no-reposimplestore
$ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
streaming all changes
7 files to transfer, 916 bytes of data
@@ -221,6 +225,8 @@
no changes found
updating to branch default
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
+#endif
+
--pull should override server's preferuncompressed
$ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
requesting all changes
@@ -239,8 +245,8 @@
abort: HTTP Error 403: no
[255]
- $ hg -R dest tag -r tip top
- $ hg -R dest push http://user:pass@localhost:$HGPORT2/
+ $ hg -R dest-pull tag -r tip top
+ $ hg -R dest-pull push http://user:pass@localhost:$HGPORT2/
pushing to http://user:***@localhost:$HGPORT2/
searching for changes
remote: adding changesets
@@ -248,7 +254,7 @@
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
$ hg rollback -q
- $ hg -R dest push http://user:pass@localhost:$HGPORT2/ --debug --config devel.debug.peer-request=yes
+ $ hg -R dest-pull push http://user:pass@localhost:$HGPORT2/ --debug --config devel.debug.peer-request=yes
pushing to http://user:***@localhost:$HGPORT2/
using http://localhost:$HGPORT2/
http auth: user user, password ****
@@ -370,14 +376,14 @@
"GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=capabilities HTTP/1.1" 401 -
- "GET /?cmd=capabilities HTTP/1.1" 200 -
- "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
- "GET /?cmd=capabilities HTTP/1.1" 401 -
- "GET /?cmd=capabilities HTTP/1.1" 200 -
+ "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
+ "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
+ "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
+ "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
+ "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
+ "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !)
+ "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !)
+ "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !)
"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
"GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
"GET /?cmd=capabilities HTTP/1.1" 401 -
--- a/tests/test-ssh-bundle1.t Tue Apr 03 14:24:14 2018 -0700
+++ b/tests/test-ssh-bundle1.t Tue Apr 03 15:08:14 2018 -0700
@@ -66,6 +66,8 @@
clone remote via stream
+#if no-reposimplestore
+
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream
streaming all changes
4 files to transfer, 602 bytes of data
@@ -102,6 +104,8 @@
$ cd ..
$ rm -rf local-stream stream2
+#endif
+
clone remote via pull
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local
@@ -499,9 +503,9 @@
Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
- Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio
- Got arguments 1:user@dummy 2:hg -R remote serve --stdio
- Got arguments 1:user@dummy 2:hg -R remote serve --stdio
+ Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !)
+ Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
+ Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
Got arguments 1:user@dummy 2:hg -R doesnotexist serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R local serve --stdio
--- a/tests/test-ssh.t Tue Apr 03 14:24:14 2018 -0700
+++ b/tests/test-ssh.t Tue Apr 03 15:08:14 2018 -0700
@@ -56,6 +56,8 @@
clone remote via stream
+#if no-reposimplestore
+
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream
streaming all changes
4 files to transfer, 602 bytes of data
@@ -92,6 +94,8 @@
$ cd ..
$ rm -rf local-stream stream2
+#endif
+
clone remote via pull
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local
@@ -530,9 +534,9 @@
Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
Got arguments 1:user@dummy 2:hg -R $TESTTMP/nonexistent serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
- Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio
- Got arguments 1:user@dummy 2:hg -R remote serve --stdio
- Got arguments 1:user@dummy 2:hg -R remote serve --stdio
+ Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !)
+ Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
+ Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !)
Got arguments 1:user@dummy 2:hg -R doesnotexist serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R local serve --stdio
--- a/tests/test-stream-bundle-v2.t Tue Apr 03 14:24:14 2018 -0700
+++ b/tests/test-stream-bundle-v2.t Tue Apr 03 15:08:14 2018 -0700
@@ -1,3 +1,5 @@
+#require no-reposimplestore
+
Test creating a consuming stream bundle v2
$ getmainid() {