changeset 6798:f46913e52954 mercurial-6.7

test-compat: create a compatibility branch for Mercurial 6.7
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 26 Jun 2024 13:44:37 +0400
parents 398a3907d343
children dc39bd5d9bb8 43b1fcb4055c
files .gitlab-ci.yml tests/test-evolve-interrupted.t tests/test-topic-flow-publish-flag.t
diffstat 3 files changed, 2 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/.gitlab-ci.yml	Wed Jun 26 13:42:40 2024 +0400
+++ b/.gitlab-ci.yml	Wed Jun 26 13:44:37 2024 +0400
@@ -26,8 +26,8 @@
         - (cd tests; ls -1 test-check-*.t > /tmp/check-tests.txt)
     script:
         - *prepare_hg
-        - ($PYTHON --version)
-        - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS)
+        - ("$PYTHON" --version)
+        - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS)
 
 checks-py3:
     <<: *runtests
@@ -46,16 +46,6 @@
         RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
 
-tests-py2-6.1:
-    <<: *runtests
-    variables:
-        PY: py2
-        PYTHON: prlimit --nofile=1024:1024 python2
-        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
-        TEST_HGMODULEPOLICY: "c"
-        HG_BRANCH: 'max(tag("re:^6\.1"))'
-    allow_failure: true
-
 doc:
     image: registry.heptapod.net/mercurial/ci-images/py3-evolve-doc
     script:
--- a/tests/test-evolve-interrupted.t	Wed Jun 26 13:42:40 2024 +0400
+++ b/tests/test-evolve-interrupted.t	Wed Jun 26 13:44:37 2024 +0400
@@ -45,8 +45,6 @@
   $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
   move:[1] banana
   atop:[2] apricot and blueberry
-  transaction abort! (no-hg64 !)
-  rollback completed (no-hg64 !)
   abort: precommit hook exited with status 1
   [40]
   $ hg l
@@ -104,8 +102,6 @@
   $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
   move:[1] banana
   atop:[2] apricot and blueberry
-  transaction abort! (no-hg64 !)
-  rollback completed (no-hg64 !)
   abort: precommit hook exited with status 1
   [40]
   $ cat b
@@ -129,8 +125,6 @@
   $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other
   move:[1] banana
   atop:[2] apricot and blueberry
-  transaction abort! (no-hg64 !)
-  rollback completed (no-hg64 !)
   abort: precommit hook exited with status 1
   [40]
   $ hg evolve --continue
--- a/tests/test-topic-flow-publish-flag.t	Wed Jun 26 13:42:40 2024 +0400
+++ b/tests/test-topic-flow-publish-flag.t	Wed Jun 26 13:44:37 2024 +0400
@@ -439,12 +439,9 @@
 
   $ cd $TESTTMP/bare-client/.hg/cache/
   $ grep double branch2* | sort
-  branch2-base:* o double//slash (glob) (hg68 !)
   branch2-immutable:* o double//slash (glob)
-  branch2-served:* o double//slash (glob) (hg68 !)
 
   $ cd $TESTTMP/bare-branch-server/.hg/cache/
   $ grep double branch2* | sort
   branch2-base:* o double//slash (glob)
   branch2-immutable:* o double//slash (glob)
-  branch2-served:* o double//slash (glob) (hg68 !)