Mercurial > evolve
changeset 5816:a1dad44fe3da
tests: remove some unnecessary config
Some of these tests were originally split from a single file that had (and
used) these options, and some of the tests were later created by just
mindlessly copypasting the same set of options that aren't applicable to the
newly written tests.
Things removed by this patch:
- web section from tests that don't use hg serve and don't push
- phases.publish from tests that don't exchange changesets between repos
- diff section from tests that don't have any diffs
- defaults section that sets the date
The defaults section that only adds -d '0 0' to commands should no longer be
necessary because run-tests.py sets devel.default-date='0 0' since 4.3, and all
command in evolve should respect this config option.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 03 Mar 2021 10:57:09 +0800 |
| parents | 44dd0e2a28bf |
| children | 17076fdc8074 |
| files | tests/test-corrupt.t tests/test-evolve-content-divergent-basic.t tests/test-evolve-content-divergent-corner-cases.t tests/test-evolve-order.t tests/test-evolve-serveronly-bundle2.t tests/test-evolve-serveronly-legacy.t tests/test-evolve-split.t tests/test-evolve-topic.t tests/test-evolve.t tests/test-fold.t tests/test-obsolete-push.t tests/test-oldconvert.t tests/test-split.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-topic-fold.t tests/test-topic-rebase.t tests/test-touch.t tests/test-tutorial.t tests/test-unstability-resolution-result.t tests/test-unstable-orphan.t tests/test-wireproto-bundle1.t tests/test-wireproto.t |
| diffstat | 23 files changed, 0 insertions(+), 140 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-corrupt.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-corrupt.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,17 +1,9 @@ $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * > [phases] > publish = False > [alias] > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n' - > [diff] - > git = 1 - > unified = 0 > [extensions] > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
--- a/tests/test-evolve-content-divergent-basic.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-content-divergent-basic.t Wed Mar 03 10:57:09 2021 +0800 @@ -8,14 +8,6 @@ $ cat >> $HGRCPATH <<EOF > [alias] > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}" - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False > [diff] > git = 1 > unified = 0
--- a/tests/test-evolve-content-divergent-corner-cases.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-content-divergent-corner-cases.t Wed Mar 03 10:57:09 2021 +0800 @@ -8,14 +8,6 @@ $ cat >> $HGRCPATH <<EOF > [alias] > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}" - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False > [diff] > git = 1 > unified = 0
--- a/tests/test-evolve-order.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-order.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,17 +2,6 @@ ----------------------- $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [experimental]
--- a/tests/test-evolve-serveronly-bundle2.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-serveronly-bundle2.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,8 +2,6 @@ $ . ${TESTDIR}/testlib/pythonpath.sh $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" > [web] > push_ssl = false > allow_push = *
--- a/tests/test-evolve-serveronly-legacy.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-serveronly-legacy.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,8 +2,6 @@ $ . ${TESTDIR}/testlib/pythonpath.sh $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" > [web] > push_ssl = false > allow_push = *
--- a/tests/test-evolve-split.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-split.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,17 +1,6 @@ Check that evolve shows error while handling split commits -------------------------------------- $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [extensions]
--- a/tests/test-evolve-topic.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve-topic.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,16 +2,8 @@ Check we can find the topic extensions $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [phases] - > publish = False > [ui] > logtemplate = {rev} - \{{get(namespaces, "topics")}} {node|short} {desc} ({phase})\n - > [diff] - > git = 1 - > unified = 0 > [extensions] > rebase = > EOF
--- a/tests/test-evolve.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-evolve.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,11 +1,4 @@ $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > metaedit=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * > [phases] > publish = False > [alias]
--- a/tests/test-fold.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-fold.t Wed Mar 03 10:57:09 2021 +0800 @@ -3,8 +3,6 @@ setup $ cat >> $HGRCPATH <<EOF - > [defaults] - > fold=-d "0 0" > [extensions] > evolve= > [alias]
--- a/tests/test-obsolete-push.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-obsolete-push.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,6 +1,4 @@ $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" > [extensions] > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
--- a/tests/test-oldconvert.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-oldconvert.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,11 +1,4 @@ $ cat >> $HGRCPATH <<EOF - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish=False - > [alias] - > odiff=diff --rev 'limit(obsparents(.),1)' --rev . > [extensions] > EOF $ mkcommit() {
--- a/tests/test-split.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-split.t Wed Mar 03 10:57:09 2021 +0800 @@ -6,16 +6,6 @@ $ cat >> $HGRCPATH <<EOF > [alias] > glog = log -G -T "{rev}:{node|short} {desc|firstline} ({phase})\n" - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > split=-d "0 0" - > amend=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False > [diff] > git = 1 > unified = 0
--- a/tests/test-stabilize-conflict.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-stabilize-conflict.t Wed Mar 03 10:57:09 2021 +0800 @@ -9,8 +9,6 @@ > interactive=false > merge=internal:merge > promptecho = True - > [defaults] - > amend=-d "0 0" > [merge-tools] > touch.checkchanged=true > touch.gui=true
--- a/tests/test-stabilize-order.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-stabilize-order.t Wed Mar 03 10:57:09 2021 +0800 @@ -1,6 +1,4 @@ $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" > [extensions] > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
--- a/tests/test-topic-fold.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-topic-fold.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,19 +2,6 @@ ------------------------ $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > split=-d "0 0" - > amend=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > interactive = true > [extensions]
--- a/tests/test-topic-rebase.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-topic-rebase.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,19 +2,6 @@ -------------------------- $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > split=-d "0 0" - > amend=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > interactive = true > [extensions]
--- a/tests/test-touch.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-touch.t Wed Mar 03 10:57:09 2021 +0800 @@ -2,8 +2,6 @@ $ cat >> $HGRCPATH <<EOF > [ui] > logtemplate={rev}:{node|short} {desc}\n - > [defaults] - > amend=-d "0 0" > [alias] > glog = log -GT "{rev}: {desc}" > [extensions]
--- a/tests/test-tutorial.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-tutorial.t Wed Mar 03 10:57:09 2021 +0800 @@ -13,11 +13,6 @@ > [diff] > # use "git" diff format, clearer and smarter format > git = 1 - > [alias] - > # "-d '0 0'" means that the new commit will be at January 1st 1970. - > # This is used for stable hash during test - > # (this tutorial is automatically tested.) - > amend = amend -d '0 0' > EOF $ hg init local
--- a/tests/test-unstability-resolution-result.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-unstability-resolution-result.t Wed Mar 03 10:57:09 2021 +0800 @@ -8,8 +8,6 @@ XXX dispatching each these test case in appropriate file would make sense. $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" > [extensions] > hgext.rebase= > EOF
--- a/tests/test-unstable-orphan.t Thu Mar 04 09:12:41 2021 +0800 +++ b/tests/test-unstable-orphan.t Wed Mar 03 10:57:09 2021 +0800 @@ -6,17 +6,6 @@ instability happens when a changesets has obsolete ancestors. $ cat >> $HGRCPATH <<EOF - > [defaults] - > amend=-d "0 0" - > fold=-d "0 0" - > [web] - > push_ssl = false - > allow_push = * - > [phases] - > publish = False - > [diff] - > git = 1 - > unified = 0 > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [extensions]