Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
0aeb6e85f5
1 changed files with 180 additions and 4 deletions
|
|
@ -7,16 +7,192 @@ found that [[!commit 5a98f2d50913682c4ebe0e0c4ce695c450a96091]] is the first bad
|
||||||
### What steps will reproduce the problem?
|
### What steps will reproduce the problem?
|
||||||
|
|
||||||
`stack setup && stack build`. Then copy git-annex.exe to `C:\annx` and in (Git) Bash say:
|
`stack setup && stack build`. Then copy git-annex.exe to `C:\annx` and in (Git) Bash say:
|
||||||
```
|
|
||||||
./git-annex test -p 'Repo Tests' 2>&1 | tee git-annex.test--p-Repo_Tests.LOG~202
|
[[!format sh """
|
||||||
grep -E '(concurrent get of dup key regression|import):' git-annex.test--p-Repo_Tests.LOG~202
|
$ ./git-annex test -p 'Repo Tests' 2>&1 | tee git-annex.test--p-Repo_Tests.LOG~202
|
||||||
```
|
$ grep -E '(concurrent get of dup key regression|import):' git-annex.test--p-Repo_Tests.LOG~202
|
||||||
|
"""]]
|
||||||
|
|
||||||
Observe two FAILs.
|
Observe two FAILs.
|
||||||
|
|
||||||
(It is unfortunate that you can't call for instance `./git-annex.exe test -p 'concurrent get of dup key regression'`
|
(It is unfortunate that you can't call for instance `./git-annex.exe test -p 'concurrent get of dup key regression'`
|
||||||
directly because of an unrelated setup issue with Tasty. I guess this would warrant a separate bug report.)
|
directly because of an unrelated setup issue with Tasty. I guess this would warrant a separate bug report.)
|
||||||
|
|
||||||
|
### Please provide any additional information below.
|
||||||
|
|
||||||
|
_Under Windows with 10.20220505-g5a98f2d50:_
|
||||||
|
|
||||||
|
[[!format sh """
|
||||||
|
jkniiv@AINESIS MINGW64 /c/annx
|
||||||
|
$ cat git-annex.test--p-Repo_Tests.LOG~202
|
||||||
|
|
||||||
|
All 0 tests passed (0.00s)
|
||||||
|
Tests
|
||||||
|
Repo Tests v8 adjusted unlocked branch
|
||||||
|
Init Tests
|
||||||
|
init: OK (10.30s)
|
||||||
|
add: OK (14.20s)
|
||||||
|
borg remote: OK
|
||||||
|
uninit: OK (15.54s)
|
||||||
|
conflict resolution (mixed directory and file): OK (154.59s)
|
||||||
|
concurrent get of dup key regression: FAIL (18.41s)
|
||||||
|
.\\Test\\Framework.hs:70:
|
||||||
|
drop with dup failed (transcript follows)
|
||||||
|
drop foo ok
|
||||||
|
drop foo2
|
||||||
|
failed
|
||||||
|
(recording state in git...)
|
||||||
|
git-annex: content is locked
|
||||||
|
drop: 1 failed
|
||||||
|
|
||||||
|
Use -p '/Repo Tests/&&/concurrent get of dup key regression/' to rerun this test only.
|
||||||
|
migrate (via gitattributes): OK (35.88s)
|
||||||
|
fsck (basics): OK (33.18s)
|
||||||
|
copy: OK (29.05s)
|
||||||
|
drop (no remote): OK (18.30s)
|
||||||
|
shared clone: OK (8.98s)
|
||||||
|
|
||||||
|
1 out of 11 tests failed (338.52s)
|
||||||
|
|
||||||
|
All 0 tests passed (0.03s)
|
||||||
|
Tests
|
||||||
|
Repo Tests v8 adjusted unlocked branch
|
||||||
|
Init Tests
|
||||||
|
init: OK (10.26s)
|
||||||
|
add: gpg testing not implemented on Windows
|
||||||
|
OK (13.95s)
|
||||||
|
crypto: OK
|
||||||
|
uninit (in git-annex branch): OK (12.13s)
|
||||||
|
conflict resolution symlink bit: OK
|
||||||
|
union merge regression: OK (148.89s)
|
||||||
|
unused: OK (59.95s)
|
||||||
|
fsck (bare): OK (5.63s)
|
||||||
|
lock: OK (29.89s)
|
||||||
|
drop (with remote): OK (22.18s)
|
||||||
|
log: OK (10.16s)
|
||||||
|
add dup: OK (15.61s)
|
||||||
|
|
||||||
|
All 12 tests passed (328.74s)
|
||||||
|
Tests
|
||||||
|
Repo Tests v8 adjusted unlocked branch
|
||||||
|
Init Tests
|
||||||
|
init: OK (10.27s)
|
||||||
|
add: OK (14.07s)
|
||||||
|
rsync remote: OK (8.80s)
|
||||||
|
conflict resolution (mixed locked and unlocked file): OK (70.62s)
|
||||||
|
conflict resolution (adjusted branch): OK (92.89s)
|
||||||
|
version: OK (10.99s)
|
||||||
|
conversion annexed to git: OK (18.28s)
|
||||||
|
fix: OK (9.54s)
|
||||||
|
move (ssh remote): OK
|
||||||
|
unannex (no copy): OK (12.49s)
|
||||||
|
export_import: OK (88.90s)
|
||||||
|
|
||||||
|
All 11 tests passed (336.95s)
|
||||||
|
Tests
|
||||||
|
Repo Tests v8 adjusted unlocked branch
|
||||||
|
Init Tests
|
||||||
|
init: OK (9.80s)
|
||||||
|
add: OK (13.22s)
|
||||||
|
add subdirs: OK (21.85s)
|
||||||
|
hook remote: OK (9.82s)
|
||||||
|
conflict resolution (nonannexed file): OK (133.39s)
|
||||||
|
transition propagation: OK (139.19s)
|
||||||
|
merge: OK (11.89s)
|
||||||
|
fsck --from remote: OK (10.01s)
|
||||||
|
edit (pre-commit): OK (15.37s)
|
||||||
|
get (ssh remote): OK
|
||||||
|
import: FAIL (20.87s)
|
||||||
|
.\\Test\\Framework.hs:70:
|
||||||
|
drop failed (transcript follows)
|
||||||
|
drop import1/f ok
|
||||||
|
drop import2/f
|
||||||
|
failed
|
||||||
|
drop import5/f
|
||||||
|
failed
|
||||||
|
(recording state in git...)
|
||||||
|
git-annex: content is locked
|
||||||
|
git-annex: content is locked
|
||||||
|
drop: 2 failed
|
||||||
|
|
||||||
|
Use -p '/Repo Tests/&&/import/' to rerun this test only.
|
||||||
|
ignore deleted files: OK (8.43s)
|
||||||
|
|
||||||
|
1 out of 12 tests failed (393.92s)
|
||||||
|
Tests
|
||||||
|
Repo Tests v8 adjusted unlocked branch
|
||||||
|
Init Tests
|
||||||
|
init: OK (10.27s)
|
||||||
|
add: OK (14.14s)
|
||||||
|
bup remote: OK (8.85s)
|
||||||
|
map: OK (12.69s)
|
||||||
|
conflict resolution movein regression: OK (92.81s)
|
||||||
|
sync: OK (58.83s)
|
||||||
|
migrate: OK (35.32s)
|
||||||
|
trust: OK (30.37s)
|
||||||
|
move (numcopies): OK (40.73s)
|
||||||
|
unannex (with copy): OK (14.55s)
|
||||||
|
export_import_subdir: OK (56.87s)
|
||||||
|
|
||||||
|
All 11 tests passed (375.49s)
|
||||||
|
Tests
|
||||||
|
Repo Tests v8 adjusted unlocked branch
|
||||||
|
Init Tests
|
||||||
|
init: OK (8.97s)
|
||||||
|
add: OK (13.79s)
|
||||||
|
preferred content: OK (63.02s)
|
||||||
|
upgrade: OK (10.77s)
|
||||||
|
conflict resolution (uncommitted local file): OK (101.39s)
|
||||||
|
adjusted branch merge regression: OK (19.12s)
|
||||||
|
describe: OK (12.57s)
|
||||||
|
fsck (local untrusted): OK (26.13s)
|
||||||
|
lock --force: OK (16.35s)
|
||||||
|
drop (untrusted remote): OK (24.97s)
|
||||||
|
view: OK (15.62s)
|
||||||
|
add extras: OK (13.99s)
|
||||||
|
|
||||||
|
All 12 tests passed (326.79s)
|
||||||
|
Tests
|
||||||
|
Repo Tests v8 adjusted unlocked branch
|
||||||
|
Init Tests
|
||||||
|
init: OK (10.67s)
|
||||||
|
add: OK (13.44s)
|
||||||
|
addurl: OK (16.86s)
|
||||||
|
directory remote: OK (32.54s)
|
||||||
|
conflict resolution (nonannexed symlink): OK (40.41s)
|
||||||
|
conflict resolution: OK (86.32s)
|
||||||
|
info: OK (13.57s)
|
||||||
|
conversion git to annexed: OK (19.97s)
|
||||||
|
partial commit: OK (20.86s)
|
||||||
|
move: OK (41.33s)
|
||||||
|
reinject: OK (16.08s)
|
||||||
|
metadata: OK (23.76s)
|
||||||
|
|
||||||
|
All 12 tests passed (335.87s)
|
||||||
|
Tests
|
||||||
|
Repo Tests v8 adjusted unlocked branch
|
||||||
|
Init Tests
|
||||||
|
init: OK (9.19s)
|
||||||
|
add: OK (13.38s)
|
||||||
|
required_content: OK (31.54s)
|
||||||
|
whereis: OK (25.92s)
|
||||||
|
conflict resolution (removed file): OK (203.83s)
|
||||||
|
adjusted branch subtree regression: OK (30.38s)
|
||||||
|
find: OK (26.15s)
|
||||||
|
fsck (remote untrusted): OK (18.86s)
|
||||||
|
edit (no pre-commit): OK (17.01s)
|
||||||
|
get: OK (13.68s)
|
||||||
|
magic: OK (5.86s)
|
||||||
|
readonly remote: OK
|
||||||
|
|
||||||
|
All 12 tests passed (395.88s)
|
||||||
|
(Failures above could be due to a bug in git-annex, or an incompatibility
|
||||||
|
with utilities, such as git, installed on this system.)
|
||||||
|
|
||||||
|
# End of transcript.
|
||||||
|
"""]]
|
||||||
|
|
||||||
|
|
||||||
### What version of git-annex are you using? On what operating system?
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
|
||||||
[[!format sh """
|
[[!format sh """
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue