This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9836

tests: skip a detailed exit status in test-lfs-test-server
ClosedPublic

Authored by mharbison72 on Jan 20 2021, 12:42 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG47b11629a0f2: tests: skip a detailed exit status in test-lfs-test-server
rHG969554e2cfc7: tests: skip a detailed exit status in test-lfs-test-server
Summary

The mode of failure here differs between lfs-test-server and hg serve, and
they each throw a different exception. The hg serve case raises a subclass of
StorageError, which gets a detailed status. The lfs-test-server case raises
a subclass of Abort, which does not. Since the exit code isn't currently
conditionizable in the tests, this is the simplest way to avoid the failure.

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

mharbison72 created this revision.Jan 20 2021, 12:42 AM
mharbison72 added a commit: rHG969554e2cfc7: tests: skip a detailed exit status in test-lfs-test-server.Jan 20 2021, 1:30 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG969554e2cfc7: tests: skip a detailed exit status in test-lfs-test-server (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.
marmoute added a subscriber: marmoute.Jan 20 2021, 7:09 AM

Should this go on stable instead to make the test fixed on stable too?

mharbison72 added a comment.Jan 20 2021, 8:47 AM
In D9836#148957, @marmoute wrote:

Should this go on stable instead to make the test fixed on stable too?

Yes

Revision Contents
Changeset List

PathPackages
Mtests/test-lfs-test-server.t (7 lines)

Diff 25165

tests/test-lfs-test-server.t

$ cp $TESTTMP/server/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 blob $ cp $TESTTMP/server/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 blob
$ echo 'damage' > $TESTTMP/server/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 $ echo 'damage' > $TESTTMP/server/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998
#endif #endif
$ rm ../repo1/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 $ rm ../repo1/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998
$ rm ../repo1/* $ rm ../repo1/*
TODO: give the proper error indication from `hg serve` TODO: give the proper error indication from `hg serve`
$ hg --repo ../repo1 update -C tip --debug TODO: reconsider the except base class so that the git and hg errors yield the
same exit status.
$ hg --repo ../repo1 update -C tip --debug --config ui.detailed-exit-code=False
http auth: user foo, password *** http auth: user foo, password ***
resolving manifests resolving manifests
branchmerge: False, force: True, partial: False branchmerge: False, force: True, partial: False
ancestor: dfca2c9e2ef2+, local: dfca2c9e2ef2+, remote: dfca2c9e2ef2 ancestor: dfca2c9e2ef2+, local: dfca2c9e2ef2+, remote: dfca2c9e2ef2
http auth: user foo, password *** http auth: user foo, password ***
Status: 200 Status: 200
Content-Length: 311 (git-server !) Content-Length: 311 (git-server !)
Content-Length: 183 (hg-server !) Content-Length: 183 (hg-server !)
} }
lfs: downloading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) (git-server !) lfs: downloading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) (git-server !)
Status: 200 (git-server !) Status: 200 (git-server !)
Content-Length: 7 (git-server !) Content-Length: 7 (git-server !)
Content-Type: text/plain; charset=utf-8 (git-server !) Content-Type: text/plain; charset=utf-8 (git-server !)
Date: $HTTP_DATE$ (git-server !) Date: $HTTP_DATE$ (git-server !)
abort: corrupt remote lfs object: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (git-server !) abort: corrupt remote lfs object: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (git-server !)
abort: LFS server error for "c": Validation error (hg-server !) abort: LFS server error for "c": Validation error (hg-server !)
[50] [255]
The corrupted blob is not added to the usercache or local store The corrupted blob is not added to the usercache or local store
$ test -f ../repo1/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 $ test -f ../repo1/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998
[1] [1]
$ test -f `hg config lfs.usercache`/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 $ test -f `hg config lfs.usercache`/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998
[1] [1]
#if git-server #if git-server