This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10196

ci: Add a job testing with rhg installed as `hg`
ClosedPublic

Authored by SimonSapin on Mar 12 2021, 5:08 PM.

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6b5714479288: ci: Add a job testing with rhg installed as `hg`
Summary

This significantly increases test coverage of rhg, without duplicating
many tests that already exist.

The cargo build command being remove only compiled a rhg executable
(as shown by the preceding cd command) but since a previous patch
run-tests.py --rhg now takes care of that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Mar 12 2021, 5:08 PM
marmoute accepted this revision.Mar 15 2021, 6:02 AM
marmoute added a subscriber: marmoute.

Great !

Alphare requested changes to this revision.Mar 15 2021, 6:50 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
contrib/heptapod-ci.yml
30

Isn't that unrelated? AFAIU, this (without the explicit rhg step) is still needed for both Python+C+Rust variants.

This revision now requires changes to proceed.Mar 15 2021, 6:50 AM
marmoute requested changes to this revision.Mar 15 2021, 7:40 AM
marmoute added inline comments.
contrib/heptapod-ci.yml
30

+1, we need to keep the --rust testing too.

SimonSapin added inline comments.Mar 15 2021, 7:49 AM
contrib/heptapod-ci.yml
30

run-tests.py --rust is still working: https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/175900#L44

It’s been capable for a long time now to tell make/setuptools to enable the Rust-based extension module for Python. This separate cargo build command was only compiling the rhg executable (as shown by the cd command), but previous patches in this series made run-tests.py/make take care of that too.

Alphare accepted this revision.Mar 15 2021, 7:50 AM

Cool, thanks!

marmoute accepted this revision.Mar 15 2021, 7:52 AM

Can you highlight this in your commit message ?

This revision now requires review to proceed.Mar 15 2021, 7:52 AM
baymax edited the summary of this revision. (Show Details)Mar 15 2021, 9:10 AM
baymax updated this revision to Diff 26359.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Mar 15 2021, 9:57 AM
SimonSapin added a commit: rHG6b5714479288: ci: Add a job testing with rhg installed as `hg`.Mar 16 2021, 5:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6b5714479288: ci: Add a job testing with rhg installed as `hg` (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.
jamsebondeea added a subscriber: jamsebondeea.Tue, Apr 5, 5:54 AM

that seems a great idea as something has been brought up for new grads. Many have complains about other companies but now that complains have been reduced with the help of a new amazon jobs philadelphia. They are the best and affordable in the town.

Revision Contents
Changeset List

PathPackages
Mcontrib/heptapod-ci.yml (21 lines)

Diff 26436

contrib/heptapod-ci.yml

- ls -1 tests/test-check-*.* > /tmp/check-tests.txt - ls -1 tests/test-check-*.* > /tmp/check-tests.txt
- black --version - black --version
- clang-format --version - clang-format --version
script: script:
- echo "python used, $PYTHON" - echo "python used, $PYTHON"
- echo "$RUNTEST_ARGS" - echo "$RUNTEST_ARGS"
- HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS
.rust_template: &rust
AlphareUnsubmitted
Not Done

Isn't that unrelated? AFAIU, this (without the explicit rhg step) is still needed for both Python+C+Rust variants.

Alphare: Isn't that unrelated? AFAIU, this (without the explicit `rhg` step) is still needed for both…
marmouteUnsubmitted
Not Done

+1, we need to keep the --rust testing too.

marmoute: +1, we need to keep the --rust testing too.
SimonSapinAuthorUnsubmitted
Done

run-tests.py --rust is still working: https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/175900#L44

It’s been capable for a long time now to tell make/setuptools to enable the Rust-based extension module for Python. This separate cargo build command was only compiling the rhg executable (as shown by the cd command), but previous patches in this series made run-tests.py/make take care of that too.

SimonSapin: `run-tests.py --rust` is still working: https://foss.heptapod.net/octobus/mercurial-devel/…
before_script:
- hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no
- hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`
- ls -1 tests/test-check-*.* > /tmp/check-tests.txt
- cd /tmp/mercurial-ci/rust/rhg
- cargo build --release
- cd /tmp/mercurial-ci/
checks-py2: checks-py2:
<<: *runtests <<: *runtests
variables: variables:
RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt" RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
checks-py3: checks-py3:
<<: *runtests <<: *runtests
variables: variables:
<<: *runtests <<: *runtests
variables: variables:
RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
PYTHON: python3 PYTHON: python3
TEST_HGMODULEPOLICY: "py" TEST_HGMODULEPOLICY: "py"
test-py2-rust: test-py2-rust:
<<: *runtests <<: *runtests
<<: *rust
variables: variables:
HGWITHRUSTEXT: cpython HGWITHRUSTEXT: cpython
RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "rust+c" TEST_HGMODULEPOLICY: "rust+c"
test-py3-rust: test-py3-rust:
<<: *runtests <<: *runtests
<<: *rust
variables: variables:
HGWITHRUSTEXT: cpython HGWITHRUSTEXT: cpython
RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
PYTHON: python3 PYTHON: python3
TEST_HGMODULEPOLICY: "rust+c" TEST_HGMODULEPOLICY: "rust+c"
test-py3-rhg:
<<: *runtests
variables:
HGWITHRUSTEXT: cpython
RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt"
PYTHON: python3
TEST_HGMODULEPOLICY: "rust+c"
test-py2-chg: test-py2-chg:
<<: *runtests <<: *runtests
variables: variables:
RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg" RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"
test-py3-chg: test-py3-chg:
<<: *runtests <<: *runtests
variables: variables:
PYTHON: python3 PYTHON: python3
RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg" RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"