jgaunt/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-16 00:04:40 +00:00
Code Issues Projects Releases Wiki Activity

bisync: add to integration tests - fixes #7665

Browse Source 
This change officially adds bisync to the nightly integration tests for all
backends.

This will be part of giving us the confidence to take bisync out of beta.

A number of fixes have been added to account for features which can differ on
different backends -- for example, hash types / modtime support, empty
directories, unicode normalization, and unimportant differences in log output.
We will likely find that more of these are needed once we start running these
with the full set of remotes.

Additionally, bisync's extremely sensitive tests revealed a few bugs in other
backends that weren't previously covered by other tests. Fixes for those issues
have been submitted on the following separate PRs (and bisync test failures will
be expected until they are merged):

- #7670 memory: fix deadlock in operations.Purge
- #7688 memory: fix incorrect list entries when rooted at subdirectory
- #7690 memory: fix dst mutating src after server-side copy
- #7692 dropbox: fix chunked uploads when size <= chunkSize

Relatedly, workarounds have been put in place for the following backend
limitations that are unsolvable for the time being:

- #3262 drive is sometimes aware of trashed files/folders when it shouldn't be
- #6199 dropbox can't handle emojis and certain other characters
- #4590 onedrive API has longstanding bug for conflictBehavior=replace in
	server-side copy/move
This commit is contained in:
nielash
2024-03-08 17:53:33 -05:00
parent fecce67ac6
commit 2bebbfaded
56 changed files with 59314 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58542
cmd/bisync/testdata/bisync_vscode_debuggers_launch.json vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
cmd/bisync/testdata/test_backupdir/golden/test.log vendored
View File

@@ -94,7 +94,7 @@ INFO : Path2: 7 changes:  1 new,  3 modified, 
INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
ERROR : file5.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found

2
cmd/bisync/testdata/test_changes/golden/test.log vendored
View File

@@ -94,7 +94,7 @@ INFO : Path2: 7 changes:  1 new,  3 modified, 
INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
ERROR : file5.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found

6
cmd/bisync/testdata/test_check_access_filters/golden/test.log vendored
View File

@@ -4,7 +4,7 @@
(02) : test EXCLUDE - OTHER TESTS
(03) : copy-file {datadir/}exclude-other-filtersfile.txt {workdir/}
(04) : test resync to get the filters file md5 built.
(04) : test resync to get the filters file {hashtype} built.
(05) : bisync resync filters-file={workdir/}exclude-other-filtersfile.txt
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
@@ -18,7 +18,7 @@ INFO : Bisyncing with Comparison Settings:
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Using filters file {workdir/}exclude-other-filtersfile.txt
INFO : Storing filters file hash to {workdir/}exclude-other-filtersfile.txt.md5
INFO : Storing filters file hash to {workdir/}exclude-other-filtersfile.txt.{hashtype}
INFO : Copying Path2 files to Path1
INFO : - Path2 Resync is copying files to - Path1
INFO : - Path1 Resync is copying files to - Path2
@@ -133,7 +133,7 @@ INFO : Bisyncing with Comparison Settings:
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Using filters file {workdir/}include-other-filtersfile.txt
INFO : Storing filters file hash to {workdir/}include-other-filtersfile.txt.md5
INFO : Storing filters file hash to {workdir/}include-other-filtersfile.txt.{hashtype}
INFO : Copying Path2 files to Path1
INFO : - Path2 Resync is copying files to - Path1
INFO : - Path1 Resync is copying files to - Path2

4
cmd/bisync/testdata/test_dry_run/golden/test.log vendored
View File

@@ -116,7 +116,7 @@ INFO : Path2: 6 changes:  1 new,  3 modified, 
INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
ERROR : file5.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
@@ -181,7 +181,7 @@ INFO : Path2: 6 changes:  1 new,  3 modified, 
INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
ERROR : file5.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found

2
cmd/bisync/testdata/test_equal/golden/test.log vendored
View File

@@ -58,7 +58,7 @@ INFO : Path2: 2 changes:  0 new,  2 modified, 
INFO : (Modified:  2 newer,  0 older,  2 larger,  0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file1.txt: md5 differ
ERROR : file1.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
NOTICE: {path2String}: 1 matching files

2
cmd/bisync/testdata/test_extended_char_paths/golden/test.log vendored
View File

@@ -171,7 +171,7 @@ INFO : Bisyncing with Comparison Settings:
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Using filters file {workdir/}測試_filtersfile.txt
INFO : Storing filters file hash to {workdir/}測試_filtersfile.txt.md5
INFO : Storing filters file hash to {workdir/}測試_filtersfile.txt.{hashtype}
INFO : Copying Path2 files to Path1
INFO : - Path2 Resync is copying files to - Path1
INFO : - Path1 Resync is copying files to - Path2

4
cmd/bisync/testdata/test_filters/golden/test.log vendored
View File

@@ -3,7 +3,7 @@
(02) : copy-file {datadir/}filtersfile.flt {workdir/}
(03) : test resync to force building of the filters md5 hash
(03) : test resync to force building of the filters {hashtype} hash
(04) : bisync filters-file={workdir/}filtersfile.flt resync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
@@ -17,7 +17,7 @@ INFO : Bisyncing with Comparison Settings:
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Using filters file {workdir/}filtersfile.flt
INFO : Storing filters file hash to {workdir/}filtersfile.flt.md5
INFO : Storing filters file hash to {workdir/}filtersfile.flt.{hashtype}
INFO : Copying Path2 files to Path1
INFO : - Path2 Resync is copying files to - Path1
INFO : - Path1 Resync is copying files to - Path2

8
cmd/bisync/testdata/test_filtersfile_checks/golden/test.log vendored
View File

@@ -24,7 +24,7 @@ INFO : Bisync successful
(04) : test 1. inject filters file in workdir.
(05) : copy-file {datadir/}filtersfile.txt {workdir/}
(06) : test 2. run with filters-file but without md5. should abort.
(06) : test 2. run with filters-file but without {hashtype}. should abort.
(07) : bisync filters-file={workdir/}filtersfile.txt
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
@@ -38,7 +38,7 @@ INFO : Bisyncing with Comparison Settings:
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Using filters file {workdir/}filtersfile.txt
ERROR : Bisync critical error: filters file md5 hash not found (must run --resync): {workdir/}filtersfile.txt
ERROR : Bisync critical error: filters file {hashtype} hash not found (must run --resync): {workdir/}filtersfile.txt
ERROR : Bisync aborted. Must run --resync to recover.
Bisync error: bisync aborted
@@ -78,7 +78,7 @@ INFO : Bisyncing with Comparison Settings:
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Using filters file {workdir/}filtersfile.txt
INFO : Storing filters file hash to {workdir/}filtersfile.txt.md5
INFO : Storing filters file hash to {workdir/}filtersfile.txt.{hashtype}
INFO : Copying Path2 files to Path1
INFO : - Path2 Resync is copying files to - Path1
INFO : - Path1 Resync is copying files to - Path2
@@ -143,7 +143,7 @@ INFO : Bisyncing with Comparison Settings:
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Using filters file {workdir/}filtersfile.txt
INFO : Skipped storing filters file hash to {workdir/}filtersfile.txt.md5 as --dry-run is set
INFO : Skipped storing filters file hash to {workdir/}filtersfile.txt.{hashtype} as --dry-run is set
INFO : Copying Path2 files to Path1
NOTICE: - Path2 Resync is copying files to - Path1
NOTICE: - Path1 Resync is copying files to - Path2

5
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.copy1to2.que vendored Normal file
View File

@@ -0,0 +1,5 @@
"file11.txt"
"file2.txt"
"file4.txt"
"file5.txt.conflict1"
"file7.txt"

5
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.copy2to1.que vendored Normal file
View File

@@ -0,0 +1,5 @@
"file1.txt"
"file10.txt"
"file3.txt"
"file5.txt.conflict2"
"file6.txt"

1
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.delete1.que vendored Normal file
View File

@@ -0,0 +1 @@
"file3.txt"

1
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.delete2.que vendored Normal file
View File

@@ -0,0 +1 @@
"file4.txt"

10
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.path1.lst vendored Normal file
View File

@@ -0,0 +1,10 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 0001-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file1.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file10.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file11.txt"
- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 0001-01-01T00:00:00.000000000+0000 "file2.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 0001-01-01T00:00:00.000000000+0000 "file5.txt.conflict1"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 0001-01-01T00:00:00.000000000+0000 "file5.txt.conflict2"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file6.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file7.txt"

8
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.path1.lst-new vendored Normal file
View File

@@ -0,0 +1,8 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 0001-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file1.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file11.txt"
- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 0001-01-01T00:00:00.000000000+0000 "file2.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file3.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 0001-01-01T00:00:00.000000000+0000 "file5.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file7.txt"

10
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.path1.lst-old vendored Normal file
View File

@@ -0,0 +1,10 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 0001-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file1.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file2.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file3.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file4.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file5.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file6.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file7.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file8.txt"

10
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.path2.lst vendored Normal file
View File

@@ -0,0 +1,10 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 0001-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file1.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file10.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file11.txt"
- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 0001-01-01T00:00:00.000000000+0000 "file2.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 0001-01-01T00:00:00.000000000+0000 "file5.txt.conflict1"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 0001-01-01T00:00:00.000000000+0000 "file5.txt.conflict2"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file6.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file7.txt"

8
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.path2.lst-new vendored Normal file
View File

@@ -0,0 +1,8 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 0001-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file1.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file10.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file2.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file4.txt"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 0001-01-01T00:00:00.000000000+0000 "file5.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 0001-01-01T00:00:00.000000000+0000 "file6.txt"

10
cmd/bisync/testdata/test_nomodtime/golden/_testdir_path1.._testdir_path2.path2.lst-old vendored Normal file
View File

@@ -0,0 +1,10 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 0001-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file1.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file2.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file3.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file4.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file5.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file6.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file7.txt"
- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 0001-01-01T00:00:00.000000000+0000 "file8.txt"

109
cmd/bisync/testdata/test_nomodtime/golden/test.log vendored Normal file
View File

@@ -0,0 +1,109 @@
(01) : test changes
(02) : test initial bisync
(03) : bisync resync nomodtime
INFO : Bisyncing with Comparison Settings:
{
"Modtime": false,
"Size": true,
"Checksum": true,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": true
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying Path2 files to Path1
INFO : - Path2 Resync is copying files to - Path1
INFO : - Path1 Resync is copying files to - Path2
INFO : Resync updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(04) : test make modifications on both paths
(05) : test new on path2 - file10
(06) : copy-file {datadir/}file10.txt {path2/}
(07) : test changed on path2 - file1
(08) : copy-file {datadir/}file1.txt {path2/}
(09) : test new on path1 - file11
(10) : copy-file {datadir/}file11.txt {path1/}
(11) : test changed on path1 - file2
(12) : copy-file {datadir/}file2.txt {path1/}
(13) : test deleted on path2 - file3
(14) : delete-file {path2/}file3.txt
(15) : test deleted on path1 - file4
(16) : delete-file {path1/}file4.txt
(17) : test deleted on both paths - file8
(18) : delete-file {path1/}file8.txt
(19) : delete-file {path2/}file8.txt
(20) : test changed on both paths - file5 (file5R, file5L)
(21) : copy-as {datadir/}file5R.txt {path2/} file5.txt
(22) : copy-as {datadir/}file5L.txt {path1/} file5.txt
(23) : test changed on path2 and deleted on path1 - file6
(24) : copy-file {datadir/}file6.txt {path2/}
(25) : delete-file {path1/}file6.txt
(26) : test changed on path1 and deleted on path2 - file7
(27) : copy-file {datadir/}file7.txt {path1/}
(28) : delete-file {path2/}file7.txt
(29) : test bisync run
(30) : bisync nomodtime
INFO : Bisyncing with Comparison Settings:
{
"Modtime": false,
"Size": true,
"Checksum": true,
"NoSlowHash": false,
"SlowHashSyncOnly": false,
"DownloadHash": true
}
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File changed: size (larger), hash - file2.txt
INFO : - Path1 File was deleted - file4.txt
INFO : - Path1 File changed: size (larger), hash - file5.txt
INFO : - Path1 File was deleted - file6.txt
INFO : - Path1 File changed: size (larger), hash - file7.txt
INFO : - Path1 File was deleted - file8.txt
INFO : - Path1 File is new - file11.txt
INFO : Path1: 7 changes:  1 new,  3 modified,  3 deleted
INFO : (Modified:  3 larger,  0 smaller,  3 hash differs)
INFO : Path2 checking for diffs
INFO : - Path2 File changed: size (larger), hash - file1.txt
INFO : - Path2 File was deleted - file3.txt
INFO : - Path2 File changed: size (larger), hash - file5.txt
INFO : - Path2 File changed: size (larger), hash - file6.txt
INFO : - Path2 File was deleted - file7.txt
INFO : - Path2 File was deleted - file8.txt
INFO : - Path2 File is new - file10.txt
INFO : Path2: 7 changes:  1 new,  3 modified,  3 deleted
INFO : (Modified:  3 larger,  0 smaller,  3 hash differs)
INFO : Applying changes
INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt
INFO : - Path2 Queue delete - {path2/}file4.txt
NOTICE: - WARNING New or changed in both paths - file5.txt
NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt.conflict1
NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt.conflict1
NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt.conflict2
NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt.conflict2
INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file7.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt
INFO : - Path1 Queue delete - {path1/}file3.txt
INFO : - Path2 Do queued copies to - Path1
INFO : - Path1 Do queued copies to - Path2
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful

1
cmd/bisync/testdata/test_nomodtime/initial/RCLONE_TEST vendored Normal file
View File

@@ -0,0 +1 @@
This file is used for testing the health of rclone accesses to the local/remote file system. Do not delete.

0
cmd/bisync/testdata/test_nomodtime/initial/file1.txt vendored Normal file
View File

0
cmd/bisync/testdata/test_nomodtime/initial/file2.txt vendored Normal file
View File

0
cmd/bisync/testdata/test_nomodtime/initial/file3.txt vendored Normal file
View File

0
cmd/bisync/testdata/test_nomodtime/initial/file4.txt vendored Normal file
View File

0
cmd/bisync/testdata/test_nomodtime/initial/file5.txt vendored Normal file
View File

0
cmd/bisync/testdata/test_nomodtime/initial/file6.txt vendored Normal file
View File

0
cmd/bisync/testdata/test_nomodtime/initial/file7.txt vendored Normal file
View File

0
cmd/bisync/testdata/test_nomodtime/initial/file8.txt vendored Normal file
View File

1
cmd/bisync/testdata/test_nomodtime/modfiles/file1.txt vendored Normal file
View File

@@ -0,0 +1 @@
This file is newer

1
cmd/bisync/testdata/test_nomodtime/modfiles/file10.txt vendored Normal file
View File

@@ -0,0 +1 @@
This file is newer

1
cmd/bisync/testdata/test_nomodtime/modfiles/file11.txt vendored Normal file
View File

@@ -0,0 +1 @@
This file is newer

1
cmd/bisync/testdata/test_nomodtime/modfiles/file2.txt vendored Normal file
View File

@@ -0,0 +1 @@
Newer version

1
cmd/bisync/testdata/test_nomodtime/modfiles/file5L.txt vendored Normal file
View File

@@ -0,0 +1 @@
This file is newer and not equal to 5R

1
cmd/bisync/testdata/test_nomodtime/modfiles/file5R.txt vendored Normal file
View File

@@ -0,0 +1 @@
This file is newer and not equal to 5L

1
cmd/bisync/testdata/test_nomodtime/modfiles/file6.txt vendored Normal file
View File

@@ -0,0 +1 @@
This file is newer

1
cmd/bisync/testdata/test_nomodtime/modfiles/file7.txt vendored Normal file
View File

@@ -0,0 +1 @@
This file is newer

53
cmd/bisync/testdata/test_nomodtime/scenario.txt vendored Normal file
View File

@@ -0,0 +1,53 @@
test changes
# Exercise all of the various file change scenarios
# - New on Path2 file10
# - changed on Path2 file1
# - New on Path1 file11
# - changed on Path1 file2
# - Deleted on Path2 file3
# - Deleted on Path1 file4
# - Changed on Path2 and on Path1 file5 (file5r, file5l)
# - changed on Path2 and deleted on Path1 file6
# - changed on Path1 and deleted on Path2 file7
# - Deleted on both paths file8
test initial bisync
bisync resync nomodtime
test make modifications on both paths
test new on path2 - file10
copy-file {datadir/}file10.txt {path2/}
test changed on path2 - file1
copy-file {datadir/}file1.txt {path2/}
test new on path1 - file11
copy-file {datadir/}file11.txt {path1/}
test changed on path1 - file2
copy-file {datadir/}file2.txt {path1/}
test deleted on path2 - file3
delete-file {path2/}file3.txt
test deleted on path1 - file4
delete-file {path1/}file4.txt
test deleted on both paths - file8
delete-file {path1/}file8.txt
delete-file {path2/}file8.txt
test changed on both paths - file5 (file5R, file5L)
copy-as {datadir/}file5R.txt {path2/} file5.txt
copy-as {datadir/}file5L.txt {path1/} file5.txt
test changed on path2 and deleted on path1 - file6
copy-file {datadir/}file6.txt {path2/}
delete-file {path1/}file6.txt
test changed on path1 and deleted on path2 - file7
copy-file {datadir/}file7.txt {path1/}
delete-file {path2/}file7.txt
test bisync run
bisync nomodtime

4
cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.copy1to2.que vendored
View File

@@ -1,3 +1,3 @@
"folder/HeLlO,wOrLd!.txt"
"folder/éééö.txt"
"newfolder/HeLlO,wOrLd!.txt"
"newfolder/éééö.txt"
"測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"

4
cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst vendored
View File

@@ -2,6 +2,6 @@
- 19 - - 2001-01-05T00:00:00.000000000+0000 "file1.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "newfolder/HeLlO,wOrLd!.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "newfolder/éééö.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"

4
cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-new vendored
View File

@@ -2,6 +2,6 @@
- 19 - - 2001-01-03T00:00:00.000000000+0000 "file1.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "newfolder/HeLlO,wOrLd!.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "newfolder/éééö.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"

4
cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-old vendored
View File

@@ -2,6 +2,6 @@
- 19 - - 2001-01-03T00:00:00.000000000+0000 "file1.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/éééö.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "newfolder/HeLlO,wOrLd!.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "newfolder/éééö.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"

4
cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst vendored
View File

@@ -2,6 +2,6 @@
- 19 - - 2001-01-05T00:00:00.000000000+0000 "file1.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/hello,WORLD!.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "newfolder/hello,WORLD!.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "newfolder/éééö.txt"
- 19 - - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"

4
cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-new vendored
View File

@@ -2,6 +2,6 @@
- 19 - - 2001-01-05T00:00:00.000000000+0000 "file1.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/hello,WORLD!.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/éééö.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "newfolder/hello,WORLD!.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "newfolder/éééö.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"

4
cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-old vendored
View File

@@ -2,6 +2,6 @@
- 19 - - 2001-01-03T00:00:00.000000000+0000 "file1.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/hello,WORLD!.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/éééö.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "newfolder/hello,WORLD!.txt"
- 19 - - 2001-01-03T00:00:00.000000000+0000 "newfolder/éééö.txt"
- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"

40
cmd/bisync/testdata/test_normalization/golden/test.log vendored
View File

@@ -103,13 +103,13 @@ INFO : Bisync successful
(19) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
(20) : copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
(21) : copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
(20) : copy-as-NFC {datadir/}file1.txt {path1/}newfolder éééö.txt
(21) : copy-as-NFC {datadir/}file1.txt {path1/}newfolder HeLlO,wOrLd!.txt
(22) : touch-copy 2001-01-03 {datadir/}file1.txt {path2/}
(23) : copy-as-NFD {datadir/}file1.txt {path2/}folder éééö.txt
(24) : copy-as-NFD {datadir/}file1.txt {path2/}folder hello,WORLD!.txt
(23) : copy-as-NFD {datadir/}file1.txt {path2/}newfolder éééö.txt
(24) : copy-as-NFD {datadir/}file1.txt {path2/}newfolder hello,WORLD!.txt
(25) : test bisync run with normalization
(26) : bisync norm force
@@ -126,14 +126,14 @@ INFO : Bisyncing with Comparison Settings:
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File is new - folder/HeLlO,wOrLd!.txt
INFO : - Path1 File is new - folder/éééö.txt
INFO : - Path1 File is new - newfolder/HeLlO,wOrLd!.txt
INFO : - Path1 File is new - newfolder/éééö.txt
INFO : - Path1 File is new - "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : Path1: 3 changes:  3 new,  0 modified,  0 deleted
INFO : Path2 checking for diffs
INFO : - Path2 File changed: time (newer) - file1.txt
INFO : - Path2 File is new - folder/éééö.txt
INFO : - Path2 File is new - folder/hello,WORLD!.txt
INFO : - Path2 File is new - newfolder/éééö.txt
INFO : - Path2 File is new - newfolder/hello,WORLD!.txt
INFO : Path2: 3 changes:  2 new,  1 modified,  0 deleted
INFO : (Modified:  1 newer,  0 older)
INFO : Applying changes
@@ -141,12 +141,12 @@ INFO : Checking potential conflicts...
NOTICE: {path2String}: 0 differences found
NOTICE: {path2String}: 2 matching files
INFO : Finished checking the potential conflicts. %!s(<nil>)
NOTICE: - WARNING New or changed in both paths - folder/HeLlO,wOrLd!.txt
INFO : folder/HeLlO,wOrLd!.txt: Files are equal but will copy anyway to update modtime (will not rename)
INFO : - Path2 Queue copy to Path1 - {path1/}folder/HeLlO,wOrLd!.txt
NOTICE: - WARNING New or changed in both paths - folder/éééö.txt
INFO : folder/éééö.txt: Files are equal but will copy anyway to update modtime (will not rename)
INFO : - Path2 Queue copy to Path1 - {path1/}folder/éééö.txt
NOTICE: - WARNING New or changed in both paths - newfolder/HeLlO,wOrLd!.txt
INFO : newfolder/HeLlO,wOrLd!.txt: Files are equal but will copy anyway to update modtime (will not rename)
INFO : - Path2 Queue copy to Path1 - {path1/}newfolder/HeLlO,wOrLd!.txt
NOTICE: - WARNING New or changed in both paths - newfolder/éééö.txt
INFO : newfolder/éééö.txt: Files are equal but will copy anyway to update modtime (will not rename)
INFO : - Path2 Queue copy to Path1 - {path1/}newfolder/éééö.txt
INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt
INFO : - Path2 Do queued copies to - Path1
@@ -178,8 +178,8 @@ INFO : Bisync successful
(29) : test changed on one path
(30) : touch-copy 2001-01-05 {datadir/}file1.txt {path2/}
(31) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
(32) : copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
(33) : copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
(32) : copy-as-NFC {datadir/}file1.txt {path1/}newfolder éééö.txt
(33) : copy-as-NFC {datadir/}file1.txt {path1/}newfolder HeLlO,wOrLd!.txt
(34) : bisync norm
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
@@ -194,8 +194,8 @@ INFO : Bisyncing with Comparison Settings:
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File changed: time (newer) - folder/HeLlO,wOrLd!.txt
INFO : - Path1 File changed: time (newer) - folder/éééö.txt
INFO : - Path1 File changed: time (newer) - newfolder/HeLlO,wOrLd!.txt
INFO : - Path1 File changed: time (newer) - newfolder/éééö.txt
INFO : - Path1 File changed: time (newer) - "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : Path1: 3 changes:  0 new,  3 modified,  0 deleted
INFO : (Modified:  3 newer,  0 older)
@@ -204,8 +204,8 @@ INFO : - Path2 File changed: time (newer)[0
INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted
INFO : (Modified:  1 newer,  0 older)
INFO : Applying changes
INFO : - Path1 Queue copy to Path2 - {path2/}folder/hello,WORLD!.txt
INFO : - Path1 Queue copy to Path2 - {path2/}folder/éééö.txt
INFO : - Path1 Queue copy to Path2 - {path2/}newfolder/hello,WORLD!.txt
INFO : - Path1 Queue copy to Path2 - {path2/}newfolder/éééö.txt
INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt
INFO : - Path2 Do queued copies to - Path1

12
cmd/bisync/testdata/test_normalization/scenario.txt vendored
View File

@@ -32,13 +32,13 @@ bisync resync
# copy NFC version to Path1
# note: need to slightly change the name to avoid Drive known issue #3262 which could try to copy the old name from the trash
copy-as-NFC {datadir/}file1.txt {path1/}測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
copy-as-NFC {datadir/}file1.txt {path1/}newfolder éééö.txt
copy-as-NFC {datadir/}file1.txt {path1/}newfolder HeLlO,wOrLd!.txt
# place newer NFD version on Path2
touch-copy 2001-01-03 {datadir/}file1.txt {path2/}
copy-as-NFD {datadir/}file1.txt {path2/}folder éééö.txt
copy-as-NFD {datadir/}file1.txt {path2/}folder hello,WORLD!.txt
copy-as-NFD {datadir/}file1.txt {path2/}newfolder éééö.txt
copy-as-NFD {datadir/}file1.txt {path2/}newfolder hello,WORLD!.txt
test bisync run with normalization
bisync norm force
@@ -49,6 +49,6 @@ bisync resync norm
test changed on one path
touch-copy 2001-01-05 {datadir/}file1.txt {path2/}
copy-as-NFC {datadir/}file1.txt {path1/}測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
copy-as-NFC {datadir/}file1.txt {path1/}newfolder éééö.txt
copy-as-NFC {datadir/}file1.txt {path1/}newfolder HeLlO,wOrLd!.txt
bisync norm

77
cmd/bisync/testdata/test_rclone_args/golden/test.log vendored
View File

@@ -1,8 +1,10 @@
(01) : test rclone-args
(02) : test initial bisync
(03) : bisync resync checksum
(02) : touch-glob 2001-01-02 {datadir/} *
(03) : test initial bisync
(04) : bisync resync checksum
INFO : Bisyncing with Comparison Settings:
{
"Modtime": false,
@@ -20,19 +22,20 @@ INFO : Resync updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(04) : test place newer files on both paths
(05) : touch-glob 2001-01-02 {datadir/} *
(05) : test place newer files on both paths
(06) : copy-file {datadir/}file1.txt {path1/}
(07) : copy-file {datadir/}file2.txt {path2/}
(08) : copy-file {datadir/}file20.txt {path1/}subdir
(09) : copy-file {datadir/}file21.txt {path2/}subdir
(10) : test run bisync with custom options
(11) : bisync checksum
(10) : touch-glob 2001-01-02 {path1/} file1.txt
(11) : touch-glob 2001-01-02 {path2/} file2.txt
(12) : touch-glob 2001-01-02 {path1/}subdir/ file20.txt
(13) : touch-glob 2001-01-02 {path2/}subdir/ file21.txt
(14) : test run bisync with custom options
(15) : bisync checksum
INFO : Bisyncing with Comparison Settings:
{
"Modtime": false,
@@ -61,15 +64,20 @@ INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(12) : touch-glob 2007-07-23 {datadir/} *
(16) : touch-glob 2007-07-23 {datadir/} *
(13) : copy-file {datadir/}file1.txt {path1/}
(14) : copy-file {datadir/}file2.txt {path2/}
(17) : copy-file {datadir/}file1.txt {path1/}
(18) : copy-file {datadir/}file2.txt {path2/}
(19) : copy-file {datadir/}file20.txt {path1/}subdir
(20) : copy-as {datadir/}file21.txt {path2/} file1.txt
(15) : copy-file {datadir/}file20.txt {path1/}subdir
(16) : copy-as {datadir/}file21.txt {path2/} file1.txt
(17) : bisync size-only
(21) : touch-glob 2007-07-23 {path1/} file1.txt
(22) : touch-glob 2007-07-23 {path2/} file2.txt
(23) : touch-glob 2007-07-23 {path1/}subdir/ file20.txt
(24) : touch-glob 2007-07-23 {path2/}subdir/ file21.txt
(25) : bisync size-only
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
@@ -93,7 +101,7 @@ INFO : - Path2 Do queued copies to - P
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(18) : bisync resync
(26) : bisync resync
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
@@ -112,13 +120,18 @@ INFO : Resync updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(19) : copy-file {datadir/}file1.txt {path1/}
(20) : copy-file {datadir/}file2.txt {path2/}
(27) : copy-file {datadir/}file1.txt {path1/}
(28) : copy-file {datadir/}file2.txt {path2/}
(29) : copy-file {datadir/}file20.txt {path1/}subdir
(30) : copy-file {datadir/}file21.txt {path2/}subdir
(21) : copy-file {datadir/}file20.txt {path1/}subdir
(22) : copy-file {datadir/}file21.txt {path2/}subdir
(23) : bisync ignore-size
(31) : touch-glob 2007-07-23 {path1/} file1.txt
(32) : touch-glob 2007-07-23 {path2/} file2.txt
(33) : touch-glob 2007-07-23 {path1/}subdir/ file20.txt
(34) : touch-glob 2007-07-23 {path2/}subdir/ file21.txt
(35) : bisync ignore-size
INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
INFO : Bisyncing with Comparison Settings:
{
@@ -145,7 +158,7 @@ INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(24) : bisync resync compare-all
(36) : bisync resync compare-all
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,
@@ -163,16 +176,22 @@ INFO : Resync updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
(25) : copy-as {datadir/}file21.txt {path2/} file2.txt
(37) : copy-as {datadir/}file21.txt {path2/} file2.txt
(26) : touch-glob 2023-08-26 {datadir/} *
(38) : touch-glob 2023-08-26 {datadir/} *
(27) : copy-file {datadir/}file1.txt {path1/}
(39) : copy-file {datadir/}file1.txt {path1/}
(28) : copy-file {datadir/}file20.txt {path1/}subdir
(29) : copy-file {datadir/}file21.txt {path2/}subdir
(40) : copy-file {datadir/}file20.txt {path1/}subdir
(41) : copy-file {datadir/}file21.txt {path2/}subdir
(30) : bisync compare-all
(42) : touch-glob 2007-07-23 {path2/} file2.txt
(43) : touch-glob 2023-08-26 {path1/} file1.txt
(44) : touch-glob 2023-08-26 {path1/}subdir/ file20.txt
(45) : touch-glob 2023-08-26 {path2/}subdir/ file21.txt
(46) : bisync compare-all
INFO : Bisyncing with Comparison Settings:
{
"Modtime": true,

33
cmd/bisync/testdata/test_rclone_args/scenario.txt vendored
View File

@@ -2,21 +2,24 @@ test rclone-args
# Pass generic flags to rclone under test using as an example
# the --size-only flag, which changes the meaning of operations.
# force specific modification time since file time is lost through git
touch-glob 2001-01-02 {datadir/} *
test initial bisync
bisync resync checksum
test place newer files on both paths
# force specific modification time since file time is lost through git
touch-glob 2001-01-02 {datadir/} *
copy-file {datadir/}file1.txt {path1/}
copy-file {datadir/}file2.txt {path2/}
copy-file {datadir/}file20.txt {path1/}subdir
copy-file {datadir/}file21.txt {path2/}subdir
# re-touch dest to avoid race conditions with parallel tests
touch-glob 2001-01-02 {path1/} file1.txt
touch-glob 2001-01-02 {path2/} file2.txt
touch-glob 2001-01-02 {path1/}subdir/ file20.txt
touch-glob 2001-01-02 {path2/}subdir/ file21.txt
test run bisync with custom options
bisync checksum
@@ -24,19 +27,29 @@ touch-glob 2007-07-23 {datadir/} *
copy-file {datadir/}file1.txt {path1/}
copy-file {datadir/}file2.txt {path2/}
copy-file {datadir/}file20.txt {path1/}subdir
copy-as {datadir/}file21.txt {path2/} file1.txt
# re-touch dest to avoid race conditions with parallel tests
touch-glob 2007-07-23 {path1/} file1.txt
touch-glob 2007-07-23 {path2/} file2.txt
touch-glob 2007-07-23 {path1/}subdir/ file20.txt
touch-glob 2007-07-23 {path2/}subdir/ file21.txt
bisync size-only
bisync resync
copy-file {datadir/}file1.txt {path1/}
copy-file {datadir/}file2.txt {path2/}
copy-file {datadir/}file20.txt {path1/}subdir
copy-file {datadir/}file21.txt {path2/}subdir
# re-touch dest to avoid race conditions with parallel tests
touch-glob 2007-07-23 {path1/} file1.txt
touch-glob 2007-07-23 {path2/} file2.txt
touch-glob 2007-07-23 {path1/}subdir/ file20.txt
touch-glob 2007-07-23 {path2/}subdir/ file21.txt
bisync ignore-size
bisync resync compare-all
@@ -50,4 +63,10 @@ copy-file {datadir/}file1.txt {path1/}
copy-file {datadir/}file20.txt {path1/}subdir
copy-file {datadir/}file21.txt {path2/}subdir
# re-touch dest to avoid race conditions with parallel tests
touch-glob 2007-07-23 {path2/} file2.txt
touch-glob 2023-08-26 {path1/} file1.txt
touch-glob 2023-08-26 {path1/}subdir/ file20.txt
touch-glob 2023-08-26 {path2/}subdir/ file21.txt
bisync compare-all

14
cmd/bisync/testdata/test_resolve/golden/test.log vendored
View File

@@ -52,7 +52,7 @@ INFO : Path2: 1 changes:  0 new,  1 modified, 
INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file1.txt: md5 differ
ERROR : file1.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
@@ -97,7 +97,7 @@ INFO : Path2: 1 changes:  0 new,  1 modified, 
INFO : (Modified:  1 newer,  0 older)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file1.txt: md5 differ
ERROR : file1.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
@@ -142,7 +142,7 @@ INFO : - Path2 File is new - f
INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file1.txt: md5 differ
ERROR : file1.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
@@ -188,7 +188,7 @@ INFO : - Path2 File is new - f
INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file1.txt: md5 differ
ERROR : file1.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
@@ -234,7 +234,7 @@ INFO : - Path2 File is new - f
INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file1.txt: md5 differ
ERROR : file1.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
@@ -283,8 +283,8 @@ INFO : Path2: 2 changes:  1 new,  1 modified, 
INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file1.txt: md5 differ
ERROR : file2.txt: md5 differ
ERROR : file1.txt: {hashtype} differ
ERROR : file2.txt: {hashtype} differ
NOTICE: {path2String}: 2 differences found
NOTICE: {path2String}: 2 errors while checking
INFO : Finished checking the potential conflicts. 2 differences found

2
cmd/bisync/testdata/test_resync_modes/golden/test.log vendored
View File

@@ -101,7 +101,7 @@ INFO : Bisyncing with Comparison Settings:
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying Path2 files to Path1
INFO : - Path2 Resync is copying files to - Path1
INFO : file1.txt: Path2 is older. Path1: 2003-09-03 20:00:00 -0400 EDT, Path2: 2003-07-22 20:00:00 -0400 EDT, Difference: 1032h0m0s
INFO : file1.txt: Path2 is older. Path1: 2003-09-04 00:00:00 +0000 UTC, Path2: 2003-07-23 00:00:00 +0000 UTC, Difference: 1032h0m0s
INFO : - Path1 Resync is copying files to - Path2
INFO : Resync updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"

6
cmd/bisync/testdata/test_volatile/golden/test.log vendored
View File

@@ -52,7 +52,7 @@ INFO : Path2: 1 changes:  0 new,  1 modified, 
INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
ERROR : file5.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
@@ -196,7 +196,7 @@ INFO : Path2: 50 changes:  43 new,  7 modified, 
INFO : (Modified:  7 newer,  0 older,  7 larger,  0 smaller)
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
ERROR : file5.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
@@ -339,7 +339,7 @@ INFO : - Path2 File is new - f
INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
ERROR : file5.txt: {hashtype} differ
NOTICE: {path2String}: 1 differences found
NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found