D3442: tests: remove #require killdaemons
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Sun May 6 02:04:30 UTC 2018
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The killdaemons hghave feature has returned True since it was
introduced in https://phab.mercurial-scm.org/rHG448d0c45214091bab205d11b6e7d037c4a6e9e6e. As such, "#require killdaemons" has
no effect and is superfluous. So we remove instances of it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3442
AFFECTED FILES
tests/test-bad-pull.t
tests/test-bundle2-remote-changegroup.t
tests/test-http-bad-server.t
tests/test-http-branchmap.t
tests/test-http-permissions.t
tests/test-http.t
tests/test-known.t
tests/test-mq-qclone-http.t
tests/test-mq-qimport.t
tests/test-phases-exchange.t
tests/test-pull-http.t
tests/test-push-http.t
tests/test-share.t
tests/test-static-http.t
tests/test-subrepo-relative-path.t
tests/test-transplant.t
tests/test-treediscovery-legacy.t
tests/test-treediscovery.t
tests/test-treemanifest.t
tests/test-unbundlehash.t
tests/test-wireproto.t
CHANGE DETAILS
diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t
--- a/tests/test-wireproto.t
+++ b/tests/test-wireproto.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
Test wire protocol argument passing
Setup repo:
diff --git a/tests/test-unbundlehash.t b/tests/test-unbundlehash.t
--- a/tests/test-unbundlehash.t
+++ b/tests/test-unbundlehash.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
Test wire protocol unbundle with hashed heads (capability: unbundlehash)
$ cat << EOF >> $HGRCPATH
diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
$ cat << EOF >> $HGRCPATH
> [ui]
> ssh=$PYTHON "$TESTDIR/dummyssh"
diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t
--- a/tests/test-treediscovery.t
+++ b/tests/test-treediscovery.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
Tests discovery against servers without getbundle support:
$ CAP="getbundle bundle2"
diff --git a/tests/test-treediscovery-legacy.t b/tests/test-treediscovery-legacy.t
--- a/tests/test-treediscovery-legacy.t
+++ b/tests/test-treediscovery-legacy.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
Tests discovery against servers without getbundle support:
$ cat >> $HGRCPATH <<EOF
diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
$ cat <<EOF >> $HGRCPATH
> [extensions]
> transplant=
diff --git a/tests/test-subrepo-relative-path.t b/tests/test-subrepo-relative-path.t
--- a/tests/test-subrepo-relative-path.t
+++ b/tests/test-subrepo-relative-path.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
Preparing the subrepository 'sub'
$ hg init sub
diff --git a/tests/test-static-http.t b/tests/test-static-http.t
--- a/tests/test-static-http.t
+++ b/tests/test-static-http.t
@@ -1,4 +1,4 @@
-#require killdaemons no-reposimplestore
+#require no-reposimplestore
$ hg clone http://localhost:$HGPORT/ copy
abort: * (glob)
diff --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
$ echo "[extensions]" >> $HGRCPATH
$ echo "share = " >> $HGRCPATH
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,5 +1,3 @@
-#require killdaemons
-
#testcases bundle1 bundle2
#if bundle1
diff --git a/tests/test-pull-http.t b/tests/test-pull-http.t
--- a/tests/test-pull-http.t
+++ b/tests/test-pull-http.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
#if no-windows
For debugging: this is a pretty simple test that is a good candidate
for tracking down network-related bugs. Sometimes a command in this
diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
--- a/tests/test-phases-exchange.t
+++ b/tests/test-phases-exchange.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
$ cat >> $HGRCPATH << EOF
> [extensions]
> phasereport=$TESTDIR/testlib/ext-phase-report.py
diff --git a/tests/test-mq-qimport.t b/tests/test-mq-qimport.t
--- a/tests/test-mq-qimport.t
+++ b/tests/test-mq-qimport.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
$ cat > writelines.py <<EOF
> import sys
> path = sys.argv[1]
diff --git a/tests/test-mq-qclone-http.t b/tests/test-mq-qclone-http.t
--- a/tests/test-mq-qclone-http.t
+++ b/tests/test-mq-qclone-http.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
hide outer repo
$ hg init
diff --git a/tests/test-known.t b/tests/test-known.t
--- a/tests/test-known.t
+++ b/tests/test-known.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
= Test the known() protocol function =
Create a test repository:
diff --git a/tests/test-http.t b/tests/test-http.t
--- a/tests/test-http.t
+++ b/tests/test-http.t
@@ -1,4 +1,4 @@
-#require killdaemons serve
+#require serve
$ hg init test
$ cd test
diff --git a/tests/test-http-permissions.t b/tests/test-http-permissions.t
--- a/tests/test-http-permissions.t
+++ b/tests/test-http-permissions.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
$ cat > fakeremoteuser.py << EOF
> import os
> from mercurial.hgweb import hgweb_mod
diff --git a/tests/test-http-branchmap.t b/tests/test-http-branchmap.t
--- a/tests/test-http-branchmap.t
+++ b/tests/test-http-branchmap.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
$ hgserve() {
> hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid \
> -E errors.log -v $@ > startup.log
diff --git a/tests/test-http-bad-server.t b/tests/test-http-bad-server.t
--- a/tests/test-http-bad-server.t
+++ b/tests/test-http-bad-server.t
@@ -1,4 +1,4 @@
-#require killdaemons serve zstd
+#require serve zstd
Client version is embedded in HTTP request and is effectively dynamic. Pin the
version so behavior is deterministic.
diff --git a/tests/test-bundle2-remote-changegroup.t b/tests/test-bundle2-remote-changegroup.t
--- a/tests/test-bundle2-remote-changegroup.t
+++ b/tests/test-bundle2-remote-changegroup.t
@@ -1,5 +1,3 @@
-#require killdaemons
-
#testcases sshv1 sshv2
#if sshv2
diff --git a/tests/test-bad-pull.t b/tests/test-bad-pull.t
--- a/tests/test-bad-pull.t
+++ b/tests/test-bad-pull.t
@@ -1,4 +1,4 @@
-#require serve killdaemons
+#require serve
$ hg clone http://localhost:$HGPORT/ copy
abort: * (glob)
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list