Skip to content

Commit fae02c7

Browse files
zzl0facebook-github-bot
authored andcommitted
tests: fix test-fold-copytrace.t on case-insensitive filesystems
Summary: drawdag automatically generates files A and B, which collide with existing files a and b on case‑insensitive filesystems and cause unexpected failures. Reviewed By: muirdm Differential Revision: D76041683 fbshipit-source-id: e5413542e082ae09c67325f012a51c055d646004
1 parent 5626a74 commit fae02c7

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

eden/scm/tests/test-fold-copytrace.t

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#require no-windows
2-
31
$ setconfig copytrace.fallback-to-content-similarity=True
42

53
test fold skipping content similarity check for large files
@@ -8,6 +6,7 @@ test fold skipping content similarity check for large files
86
> B # B/b = 1b\n2\n3\n
97
> |
108
> A # A/a = 1\n2\n3\n
9+
> # drawdag.defaultfiles=false
1110
> EOS
1211

1312
$ hg go -q $B
@@ -18,13 +17,13 @@ test fold skipping content similarity check for large files
1817
$ echo 1 >> d
1918
$ hg ci -Aqm 'add d'
2019
$ hg log -G -T '{node|short} {desc|firstline}\n'
21-
@ ca0dda5636a7 add d
20+
@ e9161e07fee8 add d
2221
23-
o 036a2c1ceb15 add c, remove a
22+
o 17061d7ed629 add c, remove a
2423
25-
o c41733be38d4 B
24+
o b184ef56f3b9 B
2625
27-
o d177b9890a58 A
26+
o 7f330679d309 A
2827
$ SL_LOG=copytrace=debug hg fold --from .^ --config copytrace.large-file-threshold=1 2>&1 | grep "file too large"
2928
DEBUG copytrace::rename_finders: file too large, skipping content similarity check large_file_threshold=ByteCount(1) source_content_len=6
3029
DEBUG copytrace::rename_finders: file too large, skipping content similarity check large_file_threshold=ByteCount(1) source_content_len=2
@@ -39,6 +38,7 @@ test fold with content similarity check
3938
> B # B/b = 1b\n2\n3\n
4039
> |
4140
> A # A/a = 1\n2\n3\n
41+
> # drawdag.defaultfiles=false
4242
> EOS
4343

4444
$ hg go -q $B
@@ -49,13 +49,13 @@ test fold with content similarity check
4949
$ echo 1 >> d
5050
$ hg ci -Aqm 'add d'
5151
$ hg log -G -T '{node|short} {desc|firstline}\n'
52-
@ ca0dda5636a7 add d
52+
@ e9161e07fee8 add d
5353
54-
o 036a2c1ceb15 add c, remove a
54+
o 17061d7ed629 add c, remove a
5555
56-
o c41733be38d4 B
56+
o b184ef56f3b9 B
5757
58-
o d177b9890a58 A
58+
o 7f330679d309 A
5959
$ SL_LOG=copytrace=debug hg fold --from .^ --config copytrace.large-file-threshold=1MB 2>&1 | grep "file too large"
6060
[1]
6161
$ hg st --change . --copies

0 commit comments

Comments
 (0)