This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9079

rust-tests: add test to check if `Cargo.lock` is up-to-date
ClosedPublic

Authored by Alphare on Sep 24 2020, 10:40 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG952f9d37002c: rust-tests: add test to check if `Cargo.lock` is up-to-date
rHG6ce7d549e98c: rust-tests: add test to check if `Cargo.lock` is up-to-date
rHGe4580da9a993: rust-tests: add test to check if `Cargo.lock` is up-to-date
Summary

An out-of-date Cargo.lock is the source of rebase conflicts, prevents a
reproductible build, introduces desync between the series that introduces a
change in dependencies and the one that eventually commits the Cargo.lock,
and is just a general annoyance.

This commit demonstrates that the test works, the next one fixes the
currently out-of-date Cargo.lock.

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

Alphare created this revision.Sep 24 2020, 10:40 AM
Alphare added a comment.Sep 24 2020, 11:23 AM

This can (should) be grafted on stable with no conflicts.

Alphare added a commit: rHGe4580da9a993: rust-tests: add test to check if `Cargo.lock` is up-to-date.Sep 24 2020, 5:28 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe4580da9a993: rust-tests: add test to check if `Cargo.lock` is up-to-date (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (5 lines)
AMtests/test-check-cargo-lock.t (11 lines)

Diff 22836

tests/hghave.py

@check("rustfmt", "rustfmt tool") @check("rustfmt", "rustfmt tool")
def has_rustfmt(): def has_rustfmt():
# We use Nightly's rustfmt due to current unstable config options. # We use Nightly's rustfmt due to current unstable config options.
return matchoutput( return matchoutput(
'`rustup which --toolchain nightly rustfmt` --version', b'rustfmt' '`rustup which --toolchain nightly rustfmt` --version', b'rustfmt'
) )
@check("cargo", "cargo tool")
def has_cargo():
return matchoutput('`rustup which cargo` --version', b'cargo')
@check("lzma", "python lzma module") @check("lzma", "python lzma module")
def has_lzma(): def has_lzma():
try: try:
import _lzma import _lzma
_lzma.FORMAT_XZ _lzma.FORMAT_XZ
return True return True
except ImportError: except ImportError:
return False return False

tests/test-check-cargo-lock.t

  • This file was added.
#require cargo test-repo
$ . "$TESTDIR/helpers-testrepo.sh"
$ cd "$TESTDIR"/../rust
Check if Cargo.lock is up-to-date. Will fail with a 101 error code if not.
$ cargo check --locked --all --quiet
However most CIs will run `cargo build` or similar before running the tests, so we need to check if it was modified
$ testrepohg diff