diff --git a/cmd/bisync/bisync_test.go b/cmd/bisync/bisync_test.go index f360bab05..118aea618 100644 --- a/cmd/bisync/bisync_test.go +++ b/cmd/bisync/bisync_test.go @@ -159,6 +159,40 @@ var logHoppers = []string{ `INFO : .*: Renamed from .*`, } +// fullLogCases are the test cases whose golden log is compared in full. +// +// These pin the wording and order of the log messages common to every +// bisync run. All other test cases compare only the lines matching +// logKeepers so that a change to a common message does not change +// every golden log. +var fullLogCases = map[string]bool{ + "basic": true, + "check_access": true, + "dry_run": true, + "filters": true, + "resync": true, +} + +// logKeepers match the log lines which are specific to a test case. +// Lines must match in full, ignoring any terminal colors. +var logKeepers = []string{ + // test steps and their output + `\(\d\d\) :.*`, + `Bisync error: .*`, + `.* - filename hash: .*`, + // anything logged above INFO level + `(?:NOTICE|ERROR ):.*`, + // changes found and queued for individual files + `INFO : - +Path[12] +(?:File|Queue) .* - .*`, + // anything logged about a named file, directory or path + `INFO : [^:]+: .+`, +} + +var ( + regexLogKeepers = regexp.MustCompile("^(?:" + strings.Join(logKeepers, "|") + ")$") + regexColor = regexp.MustCompile(`\x1b\[[0-9;]*m`) +) + // Some log lines can contain Windows path separator that must be // converted to "/" in every matching token to match golden logs. var logLinesWithSlash = []string{ @@ -1709,12 +1743,15 @@ func (b *bisyncTest) mangleResult(dir, file string, golden bool) string { s = regexBackslash.ReplaceAllString(s, "/") } + // Dropping a line here rather than above ends any group being sorted below + dropped := s != "" && !fullLogCases[b.testCase] && !regexLogKeepers.MatchString(regexColor.ReplaceAllString(s, "")) + // Sort consecutive groups of naturally unordered lines. // Any such group must end before the log ends or it might be lost. absorbed := false for i := range dampers { match := false - if s != "" && !absorbed { + if s != "" && !absorbed && !dropped { match = hoppers[i].MatchString(s) } if match { @@ -1726,7 +1763,7 @@ func (b *bisyncTest) mangleResult(dir, file string, golden bool) string { dampers[i] = nil } } - if absorbed { + if absorbed || dropped { continue } diff --git a/cmd/bisync/testdata/test_all_changed/golden/test.log b/cmd/bisync/testdata/test_all_changed/golden/test.log index a29eefe0b..ede86821a 100644 --- a/cmd/bisync/testdata/test_all_changed/golden/test.log +++ b/cmd/bisync/testdata/test_all_changed/golden/test.log @@ -3,25 +3,6 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test change timestamp on all files except RCLONE_TEST (05) : touch-glob 2005-01-02 {path1/} file* @@ -29,19 +10,6 @@ INFO : Bisync successful (07) : test sync should pass (08) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: time (newer) - file1.copy1.txt INFO : - Path1 File changed: time (newer) - file1.copy2.txt INFO : - Path1 File changed: time (newer) - file1.copy3.txt @@ -51,8 +19,6 @@ INFO : - Path1 File changed: time (newer)[0 INFO : - Path1 File changed: time (newer) - subdir/file20.txt INFO : Path1: 7 changes:  0 new,  7 modified,  0 deleted INFO : (Modified:  7 newer,  0 older) -INFO : Path2 checking for diffs -INFO : Applying changes INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy1.txt INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy2.txt INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy3.txt @@ -60,11 +26,6 @@ INFO : - Path1 Queue copy to Path2 - { INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy5.txt INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt -INFO : - Path1 Do queued copies to - Path2 -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (09) : test change timestamp on all files including RCLONE_TEST (10) : touch-glob 2004-01-02 {path1/} * @@ -72,19 +33,6 @@ INFO : Bisync successful (12) : test sync should fail (13) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: time (newer) - RCLONE_TEST INFO : - Path1 File changed: time (older) - file1.copy1.txt INFO : - Path1 File changed: time (older) - file1.copy2.txt @@ -95,26 +43,12 @@ INFO : - Path1 File changed: time (older)[0 INFO : - Path1 File changed: time (older) - subdir/file20.txt INFO : Path1: 8 changes:  0 new,  8 modified,  0 deleted INFO : (Modified:  1 newer,  7 older) -INFO : Path2 checking for diffs ERROR : Safety abort: all files were changed on Path1 "{path1/}". Run with --force if desired. NOTICE: Bisync aborted. Please try again. Bisync error: all files were changed (14) : test sync with force should pass (15) : bisync force -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: time (newer) - RCLONE_TEST INFO : - Path1 File changed: time (older) - file1.copy1.txt INFO : - Path1 File changed: time (older) - file1.copy2.txt @@ -125,8 +59,6 @@ INFO : - Path1 File changed: time (older)[0 INFO : - Path1 File changed: time (older) - subdir/file20.txt INFO : Path1: 8 changes:  0 new,  8 modified,  0 deleted INFO : (Modified:  1 newer,  7 older) -INFO : Path2 checking for diffs -INFO : Applying changes INFO : - Path1 Queue copy to Path2 - {path2/}RCLONE_TEST INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy1.txt INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy2.txt @@ -135,8 +67,3 @@ INFO : - Path1 Queue copy to Path2 - { INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy5.txt INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt -INFO : - Path1 Do queued copies to - Path2 -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_backupdir/golden/test.log b/cmd/bisync/testdata/test_backupdir/golden/test.log index b47a1ad51..b2c6fec54 100644 --- a/cmd/bisync/testdata/test_backupdir/golden/test.log +++ b/cmd/bisync/testdata/test_backupdir/golden/test.log @@ -3,25 +3,6 @@ (02) : test initial bisync (03) : bisync resync backupdir1={workdir/}backupdirs/backupdir1 backupdir2={workdir/}backupdirs/backupdir2 -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -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 @@ -62,19 +43,6 @@ INFO : Bisync successful (31) : test bisync run (32) : bisync backupdir1={workdir/}backupdirs/backupdir1 backupdir2={workdir/}backupdirs/backupdir2 -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: size (larger), time (newer) - file2.txt INFO : - Path1 File was deleted - file4.txt INFO : - Path1 File changed: size (larger), time (newer) - file5.txt @@ -84,7 +52,6 @@ INFO : - Path1 File was deleted - f INFO : - Path1 File is new - file11.txt INFO : Path1: 7 changes:  1 new,  3 modified,  3 deleted INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file1.txt INFO : - Path2 File was deleted - file3.txt INFO : - Path2 File changed: size (larger), time (newer) - file5.txt @@ -94,12 +61,9 @@ INFO : - Path2 File was deleted - f INFO : - Path2 File is new - file10.txt INFO : Path2: 7 changes:  1 new,  3 modified,  3 deleted INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) -INFO : Applying changes -INFO : Checking potential conflicts... 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 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 @@ -113,44 +77,10 @@ INFO : - Path1 Queue copy to Path2 - { 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 (33) : bisync backupdir1={workdir/}backupdirs/backupdir1 backupdir2={workdir/}backupdirs/backupdir2 -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (34) : test overlapping path -- should fail (35) : bisync backupdir1={path1/}subdir/backupdir1 backupdir2={path2/}subdir/backupdir2 -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" ERROR : Bisync critical error: destination and parameter to --backup-dir mustn't overlap ERROR : Bisync aborted. Must run --resync to recover. Bisync error: bisync aborted diff --git a/cmd/bisync/testdata/test_changes/golden/test.log b/cmd/bisync/testdata/test_changes/golden/test.log index 1fbc11cf9..fa0481f53 100644 --- a/cmd/bisync/testdata/test_changes/golden/test.log +++ b/cmd/bisync/testdata/test_changes/golden/test.log @@ -3,25 +3,6 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -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 @@ -62,19 +43,6 @@ INFO : Bisync successful (31) : test bisync run (32) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: size (larger), time (newer) - file2.txt INFO : - Path1 File was deleted - file4.txt INFO : - Path1 File changed: size (larger), time (newer) - file5.txt @@ -84,7 +52,6 @@ INFO : - Path1 File was deleted - f INFO : - Path1 File is new - file11.txt INFO : Path1: 7 changes:  1 new,  3 modified,  3 deleted INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file1.txt INFO : - Path2 File was deleted - file3.txt INFO : - Path2 File changed: size (larger), time (newer) - file5.txt @@ -94,12 +61,9 @@ INFO : - Path2 File was deleted - f INFO : - Path2 File is new - file10.txt INFO : Path2: 7 changes:  1 new,  3 modified,  3 deleted INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) -INFO : Applying changes -INFO : Checking potential conflicts... 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 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 @@ -113,8 +77,3 @@ INFO : - Path1 Queue copy to Path2 - { 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 diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/test.log b/cmd/bisync/testdata/test_check_access_filters/golden/test.log index f2fd5c2e5..104101807 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/test.log +++ b/cmd/bisync/testdata/test_check_access_filters/golden/test.log @@ -6,51 +6,9 @@ (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: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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.{hashtype} -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (06) : test EXCLUDE - test filters for check access (07) : bisync check-access 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: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}exclude-other-filtersfile.txt -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : Checking access health -INFO : Found 3 matching "RCLONE_TEST" files on both paths -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (08) : copy-listings exclude-initial (09) : test EXCLUDE - delete RCLONE_TEST files in excluded directories @@ -61,27 +19,6 @@ INFO : Bisync successful (14) : test EXCLUDE - test should PASS (15) : bisync check-access 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: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}exclude-other-filtersfile.txt -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : Checking access health -INFO : Found 3 matching "RCLONE_TEST" files on both paths -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (16) : copy-listings exclude-pass-run (17) : test EXCLUDE - delete RCLONE_TEST files in included directories @@ -90,26 +27,10 @@ INFO : Bisync successful (20) : test EXCLUDE - test should ABORT (21) : bisync check-access 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: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}exclude-other-filtersfile.txt -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - subdir/RCLONE_TEST INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted -INFO : Path2 checking for diffs INFO : - Path2 File was deleted - RCLONE_TEST INFO : Path2: 1 changes:  0 new,  0 modified,  1 deleted -INFO : Checking access health ERROR : -  Access test failed: Path1 file not found in Path2 - RCLONE_TEST ERROR : -  Access test failed: Path2 file not found in Path1 - subdir/RCLONE_TEST ERROR : Bisync critical error: check file check failed @@ -123,51 +44,9 @@ Bisync error: bisync aborted (26) : sync-dir {path1/} {path2/} (27) : copy-file {datadir/}include-other-filtersfile.txt {workdir/} (28) : bisync resync filters-file={workdir/}include-other-filtersfile.txt -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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.{hashtype} -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (29) : test INCLUDE - test include/exclude filters for check access (30) : bisync check-access filters-file={workdir/}include-other-filtersfile.txt -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}include-other-filtersfile.txt -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : Checking access health -INFO : Found 5 matching "RCLONE_TEST" files on both paths -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (31) : copy-listings include-initial (32) : test INCLUDE - delete RCLONE_TEST files in excluded directories @@ -177,27 +56,6 @@ INFO : Bisync successful (36) : test INCLUDE - test should PASS (37) : bisync check-access filters-file={workdir/}include-other-filtersfile.txt -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}include-other-filtersfile.txt -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : Checking access health -INFO : Found 5 matching "RCLONE_TEST" files on both paths -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (38) : copy-listings include-pass-run (39) : test INCLUDE - delete RCLONE_TEST files in included directories @@ -207,27 +65,11 @@ INFO : Bisync successful (43) : test INCLUDE - test should ABORT (44) : bisync check-access filters-file={workdir/}include-other-filtersfile.txt -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}include-other-filtersfile.txt -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - subdir/RCLONE_TEST INFO : - Path1 File was deleted - subdirX/subdirX1/RCLONE_TEST INFO : Path1: 2 changes:  0 new,  0 modified,  2 deleted -INFO : Path2 checking for diffs INFO : - Path2 File was deleted - RCLONE_TEST INFO : Path2: 1 changes:  0 new,  0 modified,  1 deleted -INFO : Checking access health ERROR : Access test failed: Path1 count 3, Path2 count 4 - RCLONE_TEST ERROR : -  Access test failed: Path1 file not found in Path2 - RCLONE_TEST ERROR : -  Access test failed: Path2 file not found in Path1 - subdir/RCLONE_TEST diff --git a/cmd/bisync/testdata/test_check_filename/golden/test.log b/cmd/bisync/testdata/test_check_filename/golden/test.log index 6af9275b0..200ed8e48 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/test.log +++ b/cmd/bisync/testdata/test_check_filename/golden/test.log @@ -3,70 +3,16 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test 1. see that check-access passes with the initial setup (05) : bisync check-access check-filename=.chk_file -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : Checking access health -INFO : Found 2 matching ".chk_file" files on both paths -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (06) : copy-listings initial-pass (07) : test 2. delete the remote subdir .chk_file, run sync. should fail critical. (08) : delete-file {path2/}subdir/.chk_file (09) : bisync check-access check-filename=.chk_file -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs INFO : - Path2 File was deleted - subdir/.chk_file INFO : Path2: 1 changes:  0 new,  0 modified,  1 deleted -INFO : Checking access health ERROR : Access test failed: Path1 count 2, Path2 count 1 - .chk_file ERROR : -  Access test failed: Path1 file not found in Path2 - subdir/.chk_file ERROR : Bisync critical error: check file check failed @@ -77,47 +23,6 @@ Bisync error: bisync aborted (11) : test 3. put the remote subdir .chk_file back, run resync. (12) : copy-file {path1/}subdir/.chk_file {path2/}subdir/ (13) : bisync check-access resync check-filename=.chk_file -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : Checking access health -INFO : Found 2 matching ".chk_file" files on both paths -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (14) : test 4. run sync with check-access. should pass. (15) : bisync check-access check-filename=.chk_file -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : Checking access health -INFO : Found 2 matching ".chk_file" files on both paths -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_check_sync/golden/test.log b/cmd/bisync/testdata/test_check_sync/golden/test.log index 477db33d8..8aa637418 100644 --- a/cmd/bisync/testdata/test_check_sync/golden/test.log +++ b/cmd/bisync/testdata/test_check_sync/golden/test.log @@ -3,40 +3,9 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test 1. run check-sync-only on a clean sync (05) : bisync check-sync-only -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (06) : test 2. inject modified listings into the workdir (07) : copy-as {datadir/}_testdir_path1.._testdir_path2.path1.lst {workdir/} {session}.path1.lst @@ -44,17 +13,6 @@ INFO : Bisync successful (09) : test 3. run check-sync-only on modified listings (10) : bisync check-sync-only -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" ERROR : -  Path1 file not found in Path2 - file2.txt ERROR : -  Path2 file not found in Path1 - file1.txt ERROR : Bisync critical error: path1 and path2 are out of sync, run --resync to recover @@ -64,23 +22,7 @@ Bisync error: bisync aborted (12) : test 4. run normal sync to check that it aborts (13) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" ERROR : Bisync critical error: cannot find prior Path1 or Path2 listings, likely due to critical error on prior run -Tip: here are the filenames we were looking for. Do they exist? -Path1: {workdir/}{session}.path1.lst -Path2: {workdir/}{session}.path2.lst -Try running this command to inspect the work dir: -rclone lsl "{workdir}" ERROR : Bisync aborted. Must run --resync to recover. Bisync error: bisync aborted @@ -91,63 +33,9 @@ Bisync error: bisync aborted (18) : test 6. run resync (19) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (20) : test 7. run normal sync with check-sync enabled (default) (21) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (22) : test 8. run normal sync with no-check-sync (23) : bisync no-check-sync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : No changes found -INFO : Updating listings -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_compare_all/golden/test.log b/cmd/bisync/testdata/test_compare_all/golden/test.log index faf8f2f57..8b403a02a 100644 --- a/cmd/bisync/testdata/test_compare_all/golden/test.log +++ b/cmd/bisync/testdata/test_compare_all/golden/test.log @@ -3,24 +3,6 @@ (02) : test initial bisync (03) : bisync resync compare-all -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"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 : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -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 @@ -61,18 +43,6 @@ INFO : Bisync successful (31) : test bisync run (32) : bisync compare-all -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"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), time (newer), hash - file2.txt INFO : - Path1 File was deleted - file4.txt INFO : - Path1 File changed: size (larger), time (newer), hash - file5.txt @@ -82,7 +52,6 @@ INFO : - Path1 File was deleted - f INFO : - Path1 File is new - file11.txt INFO : Path1: 7 changes:  1 new,  3 modified,  3 deleted INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller,  3 hash differs) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer), hash - file1.txt INFO : - Path2 File was deleted - file3.txt INFO : - Path2 File changed: size (larger), time (newer), hash - file5.txt @@ -92,7 +61,6 @@ INFO : - Path2 File was deleted - f INFO : - Path2 File is new - file10.txt INFO : Path2: 7 changes:  1 new,  3 modified,  3 deleted INFO : (Modified:  3 newer,  0 older,  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 @@ -106,8 +74,3 @@ INFO : - Path1 Queue copy to Path2 - { 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 diff --git a/cmd/bisync/testdata/test_concurrent/golden/test.log b/cmd/bisync/testdata/test_concurrent/golden/test.log index 3a39b641a..60faeb0fb 100644 --- a/cmd/bisync/testdata/test_concurrent/golden/test.log +++ b/cmd/bisync/testdata/test_concurrent/golden/test.log @@ -2,25 +2,6 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test changed on one path - file1 (05) : touch-glob 2001-01-02 {datadir/} file5R.txt @@ -30,46 +11,9 @@ INFO : Bisync successful (08) : test bisync with file changed during (09) : concurrent-func (10) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file1.txt INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Applying changes INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt -INFO : - Path2 Do queued copies to - Path1 -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (11) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log b/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log index d8c02879a..25cba8ee2 100644 --- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log +++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log @@ -10,25 +10,6 @@ (08) : copy-as {datadir/}placeholder.txt {path1/} file1.copy4.txt (09) : copy-as {datadir/}placeholder.txt {path1/} file1.copy5.txt (10) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (11) : test 1. Create an empty dir on Path1 by creating subdir/placeholder.txt and then deleting the placeholder (12) : copy-as {datadir/}placeholder.txt {path1/} subdir/placeholder.txt @@ -37,24 +18,6 @@ INFO : Bisync successful (15) : test 2. Run bisync without --create-empty-src-dirs (16) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (17) : test 3. Confirm the subdir exists only on Path1 and not Path2 (18) : list-dirs {path1/} @@ -63,29 +26,9 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (20) : test 4.Run bisync WITH --create-empty-src-dirs (21) : bisync create-empty-src-dirs -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File is new - subdir INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Path2 checking for diffs -INFO : Applying changes INFO : - Path1 Queue copy to Path2 - {path2/}subdir -INFO : - Path1 Do queued copies to - Path2 -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (22) : test 5. Confirm the subdir exists on both paths (23) : list-dirs {path1/} @@ -104,32 +47,12 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (33) : test 7. Run bisync without --create-empty-src-dirs (34) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - RCLONE_TEST INFO : - Path1 File was deleted - subdir INFO : Path1: 2 changes:  0 new,  0 modified,  2 deleted -INFO : Path2 checking for diffs INFO : - Path2 File was deleted - subdir INFO : Path2: 1 changes:  0 new,  0 modified,  1 deleted -INFO : Applying changes INFO : - Path2 Queue delete - {path2/}RCLONE_TEST -INFO : - Path1 Do queued copies to - Path2 -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (35) : test 8. Confirm the subdir exists only on Path2 and not Path1 (36) : list-dirs {path1/} @@ -138,25 +61,6 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (38) : test 9. Reset, do the delete again, and run bisync WITH --create-empty-src-dirs (39) : bisync resync create-empty-src-dirs -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (40) : list-dirs {path1/} subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (41) : list-dirs {path2/} @@ -174,30 +78,10 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (51) : bisync create-empty-src-dirs -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - subdir INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted -INFO : Path2 checking for diffs -INFO : Applying changes INFO : - Path2 Queue delete - {path2/}subdir -INFO : - Path1 Do queued copies to - Path2 -INFO : There was nothing to transfer INFO : subdir: Removing directory -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (52) : test 10. Confirm the subdir has been removed on both paths (53) : list-dirs {path1/} @@ -205,21 +89,3 @@ INFO : Bisync successful (55) : test 11. bisync again (because if we leave subdir in listings, test will fail due to mismatched modtime) (56) : bisync create-empty-src-dirs -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_equal/golden/test.log b/cmd/bisync/testdata/test_equal/golden/test.log index ffc16b016..1a1e54ad7 100644 --- a/cmd/bisync/testdata/test_equal/golden/test.log +++ b/cmd/bisync/testdata/test_equal/golden/test.log @@ -3,25 +3,6 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test changed on both paths and NOT identical - file1 (file1R, file1L) (05) : touch-glob 2001-01-02 {datadir/} file1R.txt @@ -36,35 +17,18 @@ INFO : Bisync successful (13) : test bisync run (14) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: size (larger), time (newer) - file1.txt INFO : - Path1 File changed: size (larger), time (newer) - file2.txt INFO : Path1: 2 changes:  0 new,  2 modified,  0 deleted INFO : (Modified:  2 newer,  0 older,  2 larger,  0 smaller) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file1.txt INFO : - Path2 File changed: size (larger), time (newer) - file2.txt INFO : Path2: 2 changes:  0 new,  2 modified,  0 deleted INFO : (Modified:  2 newer,  0 older,  2 larger,  0 smaller) -INFO : Applying changes -INFO : Checking potential conflicts... ERROR : file1.txt: {hashtype} differ NOTICE: {path2String}: 1 differences found NOTICE: {path2String}: 1 errors while checking NOTICE: {path2String}: 1 matching files -INFO : Finished checking the potential conflicts. 1 differences found NOTICE: - WARNING New or changed in both paths - file1.txt NOTICE: - Path1 Renaming Path1 copy - {path1/}file1.txt.conflict1 NOTICE: - Path1 Queue copy to Path2 - {path2/}file1.txt.conflict1 @@ -72,8 +36,3 @@ NOTICE: - Path2 Renaming Path2 copy - { NOTICE: - Path2 Queue copy to Path1 - {path1/}file1.txt.conflict2 NOTICE: - WARNING New or changed in both paths - file2.txt INFO : Files are equal! Skipping: file2.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 diff --git a/cmd/bisync/testdata/test_ext_paths/golden/test.log b/cmd/bisync/testdata/test_ext_paths/golden/test.log index e8562baa4..4adff5b47 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/test.log +++ b/cmd/bisync/testdata/test_ext_paths/golden/test.log @@ -14,25 +14,6 @@ (12) : test resync subdirs with extended chars (13) : bisync subdir=測試Русский{spc}{spc}ěáñ resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}測試Русский ěáñ/" with Path2 "{path2/}測試Русский ěáñ/" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}測試Русский ěáñ/" vs Path2 "{path2/}測試Русский ěáñ/" -INFO : Bisync successful (14) : copy-listings resync (15) : test place new files with extended chars on each side @@ -43,74 +24,20 @@ INFO : Bisync successful (19) : test normal sync of subdirs with extended chars (20) : bisync subdir=測試Русский{spc}{spc}ěáñ -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}測試Русский ěáñ/" with Path2 "{path2/}測試Русский ěáñ/" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File is new - 測試_file1p1 INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Path2 checking for diffs INFO : - Path2 File is new - 測試_file1p2 INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Applying changes INFO : - Path1 Queue copy to Path2 - {path2/}測試Русский ěáñ/測試_file1p1 INFO : - Path2 Queue copy to Path1 - {path1/}測試Русский ěáñ/測試_file1p2 -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 (21) : move-listings normal-sync (22) : test check-filename with extended chars. check should fail. (23) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (24) : delete-file {path1/}測試Русский{spc}{spc}ěáñ/測試_check{spc}file (25) : bisync check-access check-filename=測試_check{spc}file -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - 測試Русский ěáñ/測試_check file INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted -INFO : Path2 checking for diffs -INFO : Checking access health ERROR : Access test failed: Path1 count 1, Path2 count 2 - 測試_check file ERROR : -  Access test failed: Path2 file not found in Path1 - 測試Русский ěáñ/測試_check file ERROR : Bisync critical error: check file check failed @@ -120,88 +47,11 @@ Bisync error: bisync aborted (27) : test check-filename with extended chars. check should pass. (28) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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 (29) : bisync check-access check-filename=測試_check{spc}file -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : Checking access health -INFO : Found 2 matching "測試_check file" files on both paths -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (30) : move-listings check-access-pass (31) : test filters-file path with extended chars - masks /fileZ.txt (32) : copy-file {datadir/}測試_filtersfile.txt {workdir/} (33) : bisync filters-file={workdir/}測試_filtersfile.txt resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}測試_filtersfile.txt -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 : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (34) : copy-as {datadir/}file1.txt {path1/} fileZ.txt (35) : bisync filters-file={workdir/}測試_filtersfile.txt -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}測試_filtersfile.txt -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_extended_filenames/golden/test.log b/cmd/bisync/testdata/test_extended_filenames/golden/test.log index eda13848c..d30daad60 100644 --- a/cmd/bisync/testdata/test_extended_filenames/golden/test.log +++ b/cmd/bisync/testdata/test_extended_filenames/golden/test.log @@ -12,23 +12,6 @@ (10) : test initial bisync (11) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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 (12) : test place a newer files on both paths @@ -59,19 +42,6 @@ INFO : Bisync successful (35) : test bisync run (36) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - Русский.txt INFO : - Path1 File is new - file1_with white space.txt INFO : - Path1 File is new - filename_contains_ࢺ_p1m.txt @@ -80,7 +50,6 @@ INFO : - Path1 File is new - s INFO : - Path1 File is new - subdir_with_ࢺ_/mañana_funcionará.txt INFO : - Path1 File is new - subdir_with_ࢺ_/test.txt INFO : Path1: 7 changes:  6 new,  0 modified,  1 deleted -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file_enconde_mañana_funcionará.txt INFO : - Path2 File was deleted - filename_contains_ࢺ_.txt INFO : - Path2 File was deleted - subdir_with_ࢺ_/filename_contains_ě_.txt @@ -92,7 +61,6 @@ INFO : - Path2 File is new - s INFO : - Path2 File is new - subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt INFO : Path2: 9 changes:  5 new,  2 modified,  2 deleted INFO : (Modified:  2 newer,  0 older,  2 larger,  0 smaller) -INFO : Applying changes INFO : - Path1 Queue copy to Path2 - {path2/}file1_with white space.txt INFO : - Path1 Queue copy to Path2 - {path2/}filename_contains_ࢺ_p1m.txt INFO : - Path1 Queue copy to Path2 - {path2/}subdir_with_ࢺ_/file_with_測試_.txt @@ -111,8 +79,3 @@ INFO : - Path2 Queue copy to Path1 - { INFO : - Path2 Queue copy to Path1 - "{path1/}subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" INFO : - Path1 Queue delete - {path1/}subdir_with_ࢺ_/filename_contains_ě_.txt INFO : - Path2 Queue copy to Path1 - {path1/}subdir_with_ࢺ_/filename_contains_ࢺ_p2s.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 diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log b/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log index d1bf2fa1f..fd925c01a 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log @@ -3,173 +3,44 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -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 {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: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {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 (08) : test 3. run without filters-file. should be blocked due to prior abort. (09) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" ERROR : Bisync critical error: cannot find prior Path1 or Path2 listings, likely due to critical error on prior run -Tip: here are the filenames we were looking for. Do they exist? -Path1: {workdir/}{session}.path1.lst -Path2: {workdir/}{session}.path2.lst -Try running this command to inspect the work dir: -rclone lsl "{workdir}" ERROR : Bisync aborted. Must run --resync to recover. Bisync error: bisync aborted (10) : test 4. run with filters-file and resync. (11) : bisync filters-file={workdir/}filtersfile.txt resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}filtersfile.txt -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 : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (12) : test 5. run with filters-file alone. should run. (13) : bisync filters-file={workdir/}filtersfile.txt -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}filtersfile.txt -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (14) : test 6. push changed filters-file to workdir. (15) : copy-as {datadir/}filtersfile2.txt {workdir/} filtersfile.txt (16) : test 7. run with filters-file alone. should abort. (17) : bisync filters-file={workdir/}filtersfile.txt -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}filtersfile.txt ERROR : Bisync critical error: filters file has changed (must run --resync): {workdir/}filtersfile.txt ERROR : Bisync aborted. Must run --resync to recover. Bisync error: bisync aborted (18) : test 8. run with filters-file and resync and dry-run. should do the dry-run but still cause next non-resync run to abort. (19) : bisync filters-file={workdir/}filtersfile.txt resync dry-run -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}filtersfile.txt -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 -INFO : There was nothing to transfer NOTICE: - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Bisync successful (20) : test 9. run with filters-file alone. should abort. (21) : bisync filters-file={workdir/}filtersfile.txt -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Using filters file {workdir/}filtersfile.txt ERROR : Bisync critical error: filters file has changed (must run --resync): {workdir/}filtersfile.txt ERROR : Bisync aborted. Must run --resync to recover. Bisync error: bisync aborted diff --git a/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log b/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log index 2254f4f2e..9f1f923b0 100644 --- a/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log +++ b/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log @@ -3,44 +3,7 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : bisync resync ignore-listing-checksum -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (05) : test place newer files on both paths @@ -49,30 +12,11 @@ INFO : Bisync successful (08) : test bisync run (09) : bisync ignore-listing-checksum -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: size (larger), time (newer) - subdir/file20.txt INFO : Path1: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file1.txt INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Applying changes INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt INFO : - Path2 Queue copy to Path1 - {path1/}file1.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 diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/test.log b/cmd/bisync/testdata/test_max_delete_path1/golden/test.log index 7661363ff..b011d608a 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/test.log +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/test.log @@ -3,25 +3,6 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test delete >50% of local files (05) : delete-file {path1/}file1.txt @@ -32,26 +13,12 @@ INFO : Bisync successful (10) : test sync should fail due to too many local deletes (11) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - file1.txt INFO : - Path1 File was deleted - file2.txt INFO : - Path1 File was deleted - file3.txt INFO : - Path1 File was deleted - file4.txt INFO : - Path1 File was deleted - file5.txt INFO : Path1: 5 changes:  0 new,  0 modified,  5 deleted -INFO : Path2 checking for diffs ERROR : Safety abort: too many deletes (>50%, 5 of 9) on Path1 "{path1/}". Run with --force if desired. NOTICE: Bisync aborted. Please try again. Bisync error: too many deletes @@ -59,34 +26,14 @@ Bisync error: too many deletes (13) : test change max-delete limit to 60%. sync should run. (14) : bisync max-delete=60 -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - file1.txt INFO : - Path1 File was deleted - file2.txt INFO : - Path1 File was deleted - file3.txt INFO : - Path1 File was deleted - file4.txt INFO : - Path1 File was deleted - file5.txt INFO : Path1: 5 changes:  0 new,  0 modified,  5 deleted -INFO : Path2 checking for diffs -INFO : Applying changes INFO : - Path2 Queue delete - {path2/}file1.txt INFO : - Path2 Queue delete - {path2/}file2.txt INFO : - Path2 Queue delete - {path2/}file3.txt INFO : - Path2 Queue delete - {path2/}file4.txt INFO : - Path2 Queue delete - {path2/}file5.txt -INFO : - Path1 Do queued copies to - Path2 -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/test.log b/cmd/bisync/testdata/test_max_delete_path2_force/golden/test.log index 2a3510427..d6e7f017a 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/test.log +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/test.log @@ -3,25 +3,6 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test delete >50% of remote files (05) : delete-file {path2/}file1.txt @@ -32,20 +13,6 @@ INFO : Bisync successful (10) : test sync should fail due to too many path2 deletes (11) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs INFO : - Path2 File was deleted - file1.txt INFO : - Path2 File was deleted - file2.txt INFO : - Path2 File was deleted - file3.txt @@ -59,34 +26,14 @@ Bisync error: too many deletes (13) : test apply force option. sync should run. (14) : bisync force -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs INFO : - Path2 File was deleted - file1.txt INFO : - Path2 File was deleted - file2.txt INFO : - Path2 File was deleted - file3.txt INFO : - Path2 File was deleted - file4.txt INFO : - Path2 File was deleted - file5.txt INFO : Path2: 5 changes:  0 new,  0 modified,  5 deleted -INFO : Applying changes INFO : - Path1 Queue delete - {path1/}file1.txt INFO : - Path1 Queue delete - {path1/}file2.txt INFO : - Path1 Queue delete - {path1/}file3.txt INFO : - Path1 Queue delete - {path1/}file4.txt INFO : - Path1 Queue delete - {path1/}file5.txt -INFO : - Path2 Do queued copies to - Path1 -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_max_delete_track_renames/golden/test.log b/cmd/bisync/testdata/test_max_delete_track_renames/golden/test.log index 474f34932..d12c8a0a3 100644 --- a/cmd/bisync/testdata/test_max_delete_track_renames/golden/test.log +++ b/cmd/bisync/testdata/test_max_delete_track_renames/golden/test.log @@ -3,26 +3,8 @@ (02) : test resync bypasses rename-aware hash preflight with ignored listing checksums (03) : bisync resync track-renames max-delete-renames-aware ignore-listing-checksum -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 ERROR : {path1String}: Ignoring --track-renames as it doesn't work with copy or move, only sync -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 ERROR : {path2String}: Ignoring --track-renames as it doesn't work with copy or move, only sync -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test rename-aware max-delete requires track-renames (05) : bisync max-delete-renames-aware @@ -53,19 +35,6 @@ Bisync error: --max-delete-renames-aware with a hash strategy is incompatible wi (24) : test track-renames alone should retain the max-delete safety abort (25) : bisync track-renames -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - file1.txt INFO : - Path1 File was deleted - file2.txt INFO : - Path1 File was deleted - file3.txt @@ -77,7 +46,6 @@ INFO : - Path1 File is new - r INFO : - Path1 File is new - renamed-file4.txt INFO : - Path1 File is new - renamed-file5.txt INFO : Path1: 10 changes:  5 new,  0 modified,  5 deleted -INFO : Path2 checking for diffs ERROR : Safety abort: too many deletes (>50%, 5 of 9) on Path1 "{path1/}". Run with --force if desired. NOTICE: Bisync aborted. Please try again. Bisync error: too many deletes @@ -85,18 +53,6 @@ Bisync error: too many deletes (27) : test rename-aware max-delete should permit tracked renames (28) : bisync track-renames max-delete-renames-aware -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - file1.txt INFO : - Path1 File was deleted - file2.txt INFO : - Path1 File was deleted - file3.txt @@ -108,9 +64,7 @@ INFO : - Path1 File is new - r INFO : - Path1 File is new - renamed-file4.txt INFO : - Path1 File is new - renamed-file5.txt INFO : Path1: 10 changes:  5 new,  0 modified,  5 deleted -INFO : Path2 checking for diffs INFO : Path1: excluding 5 tracked renames from --max-delete -INFO : Applying changes INFO : - Path2 Queue delete - {path2/}file1.txt INFO : - Path2 Queue delete - {path2/}file2.txt INFO : - Path2 Queue delete - {path2/}file3.txt @@ -121,7 +75,6 @@ INFO : - Path1 Queue copy to Path2 - { INFO : - Path1 Queue copy to Path2 - {path2/}renamed-file3.txt INFO : - Path1 Queue copy to Path2 - {path2/}renamed-file4.txt INFO : - Path1 Queue copy to Path2 - {path2/}renamed-file5.txt -INFO : - Path1 Do queued copies to - Path2 INFO : {path2String}: Making map for --track-renames INFO : {path2String}: Finished making map for --track-renames INFO : renamed-file1.txt: Renamed from "file1.txt" @@ -129,10 +82,6 @@ INFO : renamed-file2.txt: Renamed from "file2.txt" INFO : renamed-file3.txt: Renamed from "file3.txt" INFO : renamed-file4.txt: Renamed from "file4.txt" INFO : renamed-file5.txt: Renamed from "file5.txt" -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (29) : test rename-aware max-delete should work from Path2 (30) : copy-as {path2/}renamed-file1.txt {path2/} renamed2-file1.txt @@ -146,19 +95,6 @@ INFO : Bisync successful (38) : copy-as {path2/}renamed-file5.txt {path2/} renamed2-file5.txt (39) : delete-file {path2/}renamed-file5.txt (40) : bisync track-renames max-delete-renames-aware -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs INFO : - Path2 File was deleted - renamed-file1.txt INFO : - Path2 File was deleted - renamed-file2.txt INFO : - Path2 File was deleted - renamed-file3.txt @@ -171,7 +107,6 @@ INFO : - Path2 File is new - r INFO : - Path2 File is new - renamed2-file5.txt INFO : Path2: 10 changes:  5 new,  0 modified,  5 deleted INFO : Path2: excluding 5 tracked renames from --max-delete -INFO : Applying changes INFO : - Path1 Queue delete - {path1/}renamed-file1.txt INFO : - Path1 Queue delete - {path1/}renamed-file2.txt INFO : - Path1 Queue delete - {path1/}renamed-file3.txt @@ -182,7 +117,6 @@ INFO : - Path2 Queue copy to Path1 - { INFO : - Path2 Queue copy to Path1 - {path1/}renamed2-file3.txt INFO : - Path2 Queue copy to Path1 - {path1/}renamed2-file4.txt INFO : - Path2 Queue copy to Path1 - {path1/}renamed2-file5.txt -INFO : - Path2 Do queued copies to - Path1 INFO : {path1String}: Making map for --track-renames INFO : {path1String}: Finished making map for --track-renames INFO : renamed2-file1.txt: Renamed from "renamed-file1.txt" @@ -190,10 +124,6 @@ INFO : renamed2-file2.txt: Renamed from "renamed-file2.txt" INFO : renamed2-file3.txt: Renamed from "renamed-file3.txt" INFO : renamed2-file4.txt: Renamed from "renamed-file4.txt" INFO : renamed2-file5.txt: Renamed from "renamed-file5.txt" -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (41) : test unmatched deletes should still exceed max-delete (42) : copy-as {path1/}renamed2-file1.txt {path1/} moved-file1.txt @@ -205,18 +135,6 @@ INFO : Bisync successful (48) : delete-file {path1/}file6.txt (49) : delete-file {path1/}file7.txt (50) : bisync track-renames max-delete-renames-aware -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - file6.txt INFO : - Path1 File was deleted - file7.txt INFO : - Path1 File was deleted - renamed2-file1.txt @@ -226,7 +144,6 @@ INFO : - Path1 File was deleted - r INFO : - Path1 File was deleted - renamed2-file5.txt INFO : - Path1 File is new - moved-file1.txt INFO : Path1: 8 changes:  1 new,  0 modified,  7 deleted -INFO : Path2 checking for diffs INFO : Path1: excluding 1 tracked renames from --max-delete ERROR : Safety abort: too many deletes (>50%, 6 of 9 after excluding 1 tracked renames) on Path1 "{path1/}". Run with --force if desired. NOTICE: Bisync aborted. Please try again. @@ -235,18 +152,6 @@ Bisync error: too many deletes (52) : test force bypasses max-delete and rename-aware hash preflight (53) : bisync track-renames max-delete-renames-aware ignore-listing-checksum force -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - file6.txt INFO : - Path1 File was deleted - file7.txt INFO : - Path1 File was deleted - renamed2-file1.txt @@ -256,8 +161,6 @@ INFO : - Path1 File was deleted - r INFO : - Path1 File was deleted - renamed2-file5.txt INFO : - Path1 File is new - moved-file1.txt INFO : Path1: 8 changes:  1 new,  0 modified,  7 deleted -INFO : Path2 checking for diffs -INFO : Applying changes INFO : - Path2 Queue delete - {path2/}file6.txt INFO : - Path2 Queue delete - {path2/}file7.txt INFO : - Path1 Queue copy to Path2 - {path2/}moved-file1.txt @@ -266,11 +169,6 @@ INFO : - Path2 Queue delete - { INFO : - Path2 Queue delete - {path2/}renamed2-file3.txt INFO : - Path2 Queue delete - {path2/}renamed2-file4.txt INFO : - Path2 Queue delete - {path2/}renamed2-file5.txt -INFO : - Path1 Do queued copies to - Path2 INFO : {path2String}: Making map for --track-renames INFO : {path2String}: Finished making map for --track-renames INFO : moved-file1.txt: Renamed from "renamed2-file1.txt" -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_nomodtime/golden/test.log b/cmd/bisync/testdata/test_nomodtime/golden/test.log index 6494e6f76..ce9e45536 100644 --- a/cmd/bisync/testdata/test_nomodtime/golden/test.log +++ b/cmd/bisync/testdata/test_nomodtime/golden/test.log @@ -3,24 +3,6 @@ (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 : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -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 @@ -59,18 +41,6 @@ INFO : Bisync successful (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 @@ -80,7 +50,6 @@ INFO : - Path1 File was deleted - f 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 @@ -90,7 +59,6 @@ INFO : - Path2 File was deleted - f 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 @@ -104,8 +72,3 @@ INFO : - Path1 Queue copy to Path2 - { 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 diff --git a/cmd/bisync/testdata/test_normalization/golden/test.log b/cmd/bisync/testdata/test_normalization/golden/test.log index aea5f4161..78e536659 100644 --- a/cmd/bisync/testdata/test_normalization/golden/test.log +++ b/cmd/bisync/testdata/test_normalization/golden/test.log @@ -4,23 +4,6 @@ (02) : touch-copy 2001-01-02 {datadir/}file1.txt {path2/} (03) : test initial bisync (04) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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 (05) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt @@ -34,47 +17,25 @@ INFO : Bisync successful (11) : test bisync run with fix-case (12) : bisync fix-case -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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 - "測試_Русский___ě_áñ👸🏼🧝🏾\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: size (larger), time (newer) - file1.txt INFO : - Path2 File is new - folder/éééö.txt INFO : - Path2 File is new - folder/hello,WORLD!.txt INFO : Path2: 3 changes:  2 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Applying changes -INFO : Checking potential conflicts... NOTICE: {path2String}: 0 differences found NOTICE: {path2String}: 2 matching files -INFO : Finished checking the potential conflicts. %!s() 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 fix case to 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 fix case to folder/éééö.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 -INFO : - Path1 Do queued copies to - Path2 INFO : folder/hello,WORLD!.txt: Fixed case by renaming to: folder/HeLlO,wOrLd!.txt INFO : folder/éééö.txt: Fixed case by renaming to: folder/éééö.txt -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (13) : purge-children {path1/} @@ -83,23 +44,6 @@ INFO : Bisync successful (16) : copy-as-NFC {datadir/}file1.txt {path2/} file2.txt (17) : copy-as-NFC {datadir/}file1.txt {path1/} file3.txt (18) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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 (19) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt @@ -113,34 +57,17 @@ INFO : Bisync successful (25) : test bisync run with normalization (26) : bisync norm force -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs 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 - 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 -INFO : Checking potential conflicts... NOTICE: {path2String}: 0 differences found NOTICE: {path2String}: 2 matching files -INFO : Finished checking the potential conflicts. %!s() 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 @@ -149,31 +76,9 @@ INFO : newfolder/éééö.txt: Files are equal but will copy anyway to update m 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 -INFO : - Path1 Do queued copies to - Path2 -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (27) : test resync (28) : bisync resync norm -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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 (29) : test changed on one path (30) : touch-copy 2001-01-05 {datadir/}file1.txt {path2/} @@ -181,35 +86,15 @@ INFO : Bisync successful (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: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs 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) -INFO : Path2 checking for diffs INFO : - Path2 File changed: time (newer) - file1.txt 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/}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 -INFO : - Path1 Do queued copies to - Path2 -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_rclone_args/golden/test.log b/cmd/bisync/testdata/test_rclone_args/golden/test.log index 89e096e8a..a225e235d 100644 --- a/cmd/bisync/testdata/test_rclone_args/golden/test.log +++ b/cmd/bisync/testdata/test_rclone_args/golden/test.log @@ -5,24 +5,6 @@ (03) : test initial bisync (04) : bisync resync checksum -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 : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (05) : test place newer files on both paths (06) : copy-file {datadir/}file1.txt {path1/} @@ -38,33 +20,14 @@ INFO : Bisync successful (14) : test run bisync with custom options (15) : bisync checksum -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: hash - file1.txt INFO : Path1: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 hash differs) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), hash - file2.txt INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 larger,  0 smaller,  1 hash differs) -INFO : Applying changes INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt INFO : - Path2 Queue copy to Path1 - {path1/}file2.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 (16) : touch-glob 2007-07-23 {datadir/} * @@ -80,49 +43,11 @@ INFO : Bisync successful (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: -{ -"Modtime": false, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (smaller) - file1.txt INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  0 larger,  1 smaller) -INFO : Applying changes INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt -INFO : - Path2 Do queued copies to - Path1 -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (26) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (27) : copy-file {datadir/}file1.txt {path1/} (28) : copy-file {datadir/}file2.txt {path2/} @@ -136,51 +61,14 @@ INFO : Bisync successful (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: -{ -"Modtime": true, -"Size": false, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs INFO : - Path2 File changed: time (newer) - file2.txt INFO : - Path2 File changed: time (newer) - subdir/file21.txt INFO : Path2: 2 changes:  0 new,  2 modified,  0 deleted INFO : (Modified:  2 newer,  0 older) -INFO : Applying changes INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt INFO : - Path2 Queue copy to Path1 - {path1/}subdir/file21.txt -INFO : - Path2 Do queued copies to - Path1 -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (36) : bisync resync compare-all -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"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 : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (37) : copy-as {datadir/}file21.txt {path2/} file2.txt @@ -198,34 +86,15 @@ INFO : Bisync successful (45) : touch-glob 2023-08-26 {path2/}subdir/ file21.txt (46) : bisync compare-all -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"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: time (newer) - file1.txt INFO : - Path1 File changed: time (newer) - subdir/file20.txt INFO : Path1: 2 changes:  0 new,  2 modified,  0 deleted INFO : (Modified:  2 newer,  0 older) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (smaller), hash - file2.txt INFO : - Path2 File changed: time (newer) - subdir/file21.txt INFO : Path2: 2 changes:  0 new,  2 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  0 larger,  1 smaller,  1 hash differs) -INFO : Applying changes INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt INFO : - Path2 Queue copy to Path1 - {path1/}subdir/file21.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 diff --git a/cmd/bisync/testdata/test_resolve/golden/test.log b/cmd/bisync/testdata/test_resolve/golden/test.log index fb4d03c0c..f2e4311c6 100644 --- a/cmd/bisync/testdata/test_resolve/golden/test.log +++ b/cmd/bisync/testdata/test_resolve/golden/test.log @@ -3,25 +3,6 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test changed on both paths and NOT identical - file1 (file1R, file1L) (05) : touch-glob 2001-01-02 {datadir/} file1R.txt @@ -32,41 +13,20 @@ INFO : Bisync successful (09) : test bisync run with --conflict-resolve=newer --conflict-loser=delete --conflict-suffix=potato (10) : bisync conflict-resolve=newer conflict-loser=delete conflict-suffix=potato -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: size (larger), time (newer) - file1.txt INFO : Path1: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file1.txt INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Applying changes -INFO : Checking potential conflicts... 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 NOTICE: - WARNING New or changed in both paths - file1.txt INFO : file1.txt: Path1 is newer. Path1: 2001-03-04 00:00:00 +0000 UTC, Path2: 2001-01-02 00:00:00 +0000 UTC, Difference: 1464h0m0s INFO : file1.txt: The winner is: Path1 NOTICE: - Path2 Deleting Path2 copy - {path2/}file1.txt INFO : - Path1 Queue copy to Path2 - file1.txt -INFO : - Path1 Do queued copies to - Path2 -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (11) : test changed on both paths and NOT identical - file1 (file1R, file1L) (12) : touch-glob 2001-07-23 {datadir/} file1R.txt @@ -77,43 +37,21 @@ INFO : Bisync successful (16) : test bisync run with --conflict-resolve=path2 --conflict-loser=num --conflict-suffix=dinosaur (17) : bisync conflict-resolve=path2 conflict-loser=num conflict-suffix=dinosaur -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: time (newer) - file1.txt INFO : Path1: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older) -INFO : Path2 checking for diffs INFO : - Path2 File changed: time (newer) - file1.txt INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older) -INFO : Applying changes -INFO : Checking potential conflicts... 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 NOTICE: - WARNING New or changed in both paths - file1.txt INFO : file1.txt: The winner is: Path2 NOTICE: - Path1 Renaming Path1 copy - {path1/}file1.txt.dinosaur1 NOTICE: - Path1 Queue copy to Path2 - {path2/}file1.txt.dinosaur1 NOTICE: - Path2 Not renaming Path2 copy, as it was determined the winner - {path2/}file1.txt NOTICE: - Path2 Queue copy to Path1 - {path1/}file1.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 (18) : test changed on both paths and NOT identical - file1 (file1R, file1L) (19) : touch-glob 2002-07-23 {datadir/} file1R.txt @@ -124,30 +62,13 @@ INFO : Bisync successful (23) : test bisync run with --conflict-resolve=larger --conflict-loser=num --conflict-suffix=apple (24) : bisync conflict-resolve=larger conflict-loser=num conflict-suffix=apple -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File is new - file1.txt INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Path2 checking for diffs INFO : - Path2 File is new - file1.txt INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Applying changes -INFO : Checking potential conflicts... 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 NOTICE: - WARNING New or changed in both paths - file1.txt INFO : file1.txt: Winner cannot be determined as sizes are equal. Path1: 33, Path2: 33, Difference: 0 INFO : file1.txt: A winner could not be determined. @@ -155,11 +76,6 @@ NOTICE: - Path1 Renaming Path1 copy - { NOTICE: - Path1 Queue copy to Path2 - {path2/}file1.txt.apple1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file1.txt.apple2 NOTICE: - Path2 Queue copy to Path1 - {path1/}file1.txt.apple2 -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 (25) : test different suffixes (26) : touch-glob 2003-07-23 {datadir/} file1R.txt @@ -170,30 +86,13 @@ INFO : Bisync successful (30) : test bisync run with --conflict-resolve=older --conflict-loser=num --conflict-suffix=cloud,local (31) : bisync conflict-resolve=older conflict-loser=num conflict-suffix=cloud,local -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File is new - file1.txt INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Path2 checking for diffs INFO : - Path2 File is new - file1.txt INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Applying changes -INFO : Checking potential conflicts... 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 NOTICE: - WARNING New or changed in both paths - file1.txt INFO : file1.txt: Winner cannot be determined as times are equal. Path1: 2003-07-23 00:00:00 +0000 UTC, Path2: 2003-07-23 00:00:00 +0000 UTC, Difference: 0s INFO : file1.txt: A winner could not be determined. @@ -201,11 +100,6 @@ NOTICE: - Path1 Renaming Path1 copy - { NOTICE: - Path1 Queue copy to Path2 - {path2/}file1.txt.cloud1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file1.txt.local1 NOTICE: - Path2 Queue copy to Path1 - {path1/}file1.txt.local1 -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 (32) : test legacy (33) : touch-glob 2004-07-23 {datadir/} file1R.txt @@ -216,40 +110,18 @@ INFO : Bisync successful (37) : test bisync run with --conflict-resolve=none --conflict-loser=pathname --conflict-suffix=.path (38) : bisync conflict-resolve=none conflict-loser=pathname conflict-suffix=.path -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File is new - file1.txt INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Path2 checking for diffs INFO : - Path2 File is new - file1.txt INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Applying changes -INFO : Checking potential conflicts... 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 NOTICE: - WARNING New or changed in both paths - file1.txt NOTICE: - Path1 Renaming Path1 copy - {path1/}file1.txt..path1 NOTICE: - Path1 Queue copy to Path2 - {path2/}file1.txt..path1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file1.txt..path2 NOTICE: - Path2 Queue copy to Path1 - {path1/}file1.txt..path2 -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 (39) : test deletes on both sides with default suffix (40) : touch-glob 2005-01-02 {datadir/} file1R.txt @@ -261,35 +133,18 @@ INFO : Bisync successful (46) : test bisync run with --conflict-resolve=newer --conflict-loser=delete (47) : bisync conflict-resolve=newer conflict-loser=delete -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: size (larger), time (newer) - file2.txt INFO : - Path1 File is new - file1.txt INFO : Path1: 2 changes:  1 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file2.txt INFO : - Path2 File is new - file1.txt INFO : Path2: 2 changes:  1 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Applying changes -INFO : Checking potential conflicts... 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 NOTICE: - WARNING New or changed in both paths - file1.txt INFO : file1.txt: Path1 is newer. Path1: 2006-03-04 00:00:00 +0000 UTC, Path2: 2005-01-02 00:00:00 +0000 UTC, Difference: 10224h0m0s INFO : file1.txt: The winner is: Path1 @@ -300,11 +155,6 @@ INFO : file2.txt: Path2 is newer. Path1: 2005-01-02 00:00:00 +0000 UTC, Path2: INFO : file2.txt: The winner is: Path2 NOTICE: - Path1 Deleting Path1 copy - {path1/}file2.txt INFO : - Path2 Queue copy to Path1 - file2.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 (48) : test --conflict-resolve newer --conflict-loser pathname --conflict-suffix path (49) : touch-glob 2004-07-23 {datadir/} file1R.txt @@ -315,35 +165,18 @@ INFO : Bisync successful (53) : test bisync run with --conflict-resolve=newer --conflict-loser=pathname --conflict-suffix=path (54) : bisync conflict-resolve=newer conflict-loser=pathname conflict-suffix=path -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: time (older) - file1.txt INFO : - Path1 File is new - file2.txt INFO : Path1: 2 changes:  1 new,  1 modified,  0 deleted INFO : (Modified:  0 newer,  1 older) -INFO : Path2 checking for diffs INFO : - Path2 File changed: time (older) - file1.txt INFO : - Path2 File is new - file2.txt INFO : Path2: 2 changes:  1 new,  1 modified,  0 deleted INFO : (Modified:  0 newer,  1 older) -INFO : Applying changes -INFO : Checking potential conflicts... ERROR : file1.txt: {hashtype} differ NOTICE: {path2String}: 1 differences found NOTICE: {path2String}: 1 errors while checking NOTICE: {path2String}: 1 matching files -INFO : Finished checking the potential conflicts. 1 differences found NOTICE: - WARNING New or changed in both paths - file1.txt INFO : file1.txt: Path1 is newer. Path1: 2004-07-25 00:00:00 +0000 UTC, Path2: 2004-07-23 00:00:00 +0000 UTC, Difference: 48h0m0s INFO : file1.txt: The winner is: Path1 @@ -353,8 +186,3 @@ NOTICE: - Path2 Renaming Path2 copy - { NOTICE: - Path2 Queue copy to Path1 - {path1/}file1.txt.path2 NOTICE: - WARNING New or changed in both paths - file2.txt INFO : Files are equal! Skipping: file2.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 diff --git a/cmd/bisync/testdata/test_resync_modes/golden/test.log b/cmd/bisync/testdata/test_resync_modes/golden/test.log index 1d89638f1..713403f79 100644 --- a/cmd/bisync/testdata/test_resync_modes/golden/test.log +++ b/cmd/bisync/testdata/test_resync_modes/golden/test.log @@ -9,24 +9,6 @@ (07) : test bisync run with --resync-mode=newer (08) : bisync resync resync-mode=newer -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (09) : test changed on both paths and NOT identical - file1 (file1R, file1L) (10) : touch-glob 2001-07-23 {datadir/} file1R.txt @@ -36,23 +18,6 @@ INFO : Bisync successful (14) : test bisync run with --resync-mode=path2 (15) : bisync resync resync-mode=path2 -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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 (16) : test changed on both paths and NOT identical - file1 (file1R, file1L) (17) : touch-glob 2002-07-23 {datadir/} file1R.txt @@ -62,24 +27,7 @@ INFO : Bisync successful (21) : test bisync run with --resync-mode=larger (22) : bisync resync resync-mode=larger -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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 larger. Path1: 33, Path2: 42, Difference: 9 -INFO : - Path1 Resync is copying files to - Path2 -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (23) : test changed on both paths and NOT identical - file1 (file1R, file1L) (24) : touch-glob 2003-07-23 {datadir/} file1R.txt @@ -89,24 +37,7 @@ INFO : Bisync successful (28) : test bisync run with --resync-mode=older (29) : bisync resync resync-mode=older -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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-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/}" -INFO : Bisync successful (30) : test changed on both paths and NOT identical - file1 (file1R, file1L) (31) : touch-glob 2004-07-23 {datadir/} file1R.txt @@ -116,26 +47,8 @@ INFO : Bisync successful (35) : test bisync run with --resync-mode=smaller (36) : bisync resync resync-mode=smaller -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 INFO : file1.txt: Path1 is smaller. Path1: 33, Path2: 42, Difference: 9 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 INFO : file1.txt: Path1 is smaller. Path1: 33, Path2: 42, Difference: 9 -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (37) : test changed on both paths and NOT identical - file1 (file1R, file1L) (38) : touch-glob 2005-01-02 {datadir/} file1R.txt @@ -147,24 +60,6 @@ INFO : Bisync successful (44) : test bisync run with --resync-mode=path1 (45) : bisync resync resync-mode=path1 -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (46) : test no winner (47) : touch-glob 2022-02-22 {datadir/} file1R.txt @@ -176,20 +71,3 @@ INFO : Bisync successful (53) : test bisync run with --resync-mode=newer (54) : bisync resync resync-mode=newer -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -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 diff --git a/cmd/bisync/testdata/test_rmdirs/golden/test.log b/cmd/bisync/testdata/test_rmdirs/golden/test.log index 12e6f0826..42bd59ec0 100644 --- a/cmd/bisync/testdata/test_rmdirs/golden/test.log +++ b/cmd/bisync/testdata/test_rmdirs/golden/test.log @@ -3,54 +3,15 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test 1. delete path1 subdir file (05) : delete-file {path1/}subdir/file20.txt (06) : test 2. run bisync without remove-empty-dirs (07) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File was deleted - subdir/file20.txt INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted -INFO : Path2 checking for diffs -INFO : Applying changes INFO : - Path2 Queue delete - {path2/}subdir/file20.txt -INFO : - Path1 Do queued copies to - Path2 -INFO : There was nothing to transfer -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (08) : test 3. confirm the subdir still exists on both paths (09) : list-dirs {path1/} @@ -60,27 +21,8 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (11) : test 4. run bisync with remove-empty-dirs (12) : bisync remove-empty-dirs -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs -INFO : Path2 checking for diffs -INFO : No changes found -INFO : Updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Removing empty directories INFO : subdir: Removing directory INFO : subdir: Removing directory -INFO : Bisync successful (13) : test 5. confirm the subdir has been removed on both paths (14) : list-dirs {path1/} diff --git a/cmd/bisync/testdata/test_volatile/golden/test.log b/cmd/bisync/testdata/test_volatile/golden/test.log index f4263e8ca..8ea99ee0e 100644 --- a/cmd/bisync/testdata/test_volatile/golden/test.log +++ b/cmd/bisync/testdata/test_volatile/golden/test.log @@ -2,25 +2,6 @@ (02) : test initial bisync (03) : bisync resync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Copying Path2 files to Path1 -INFO : - Path2 Resync is copying files to - Path1 -INFO : There was nothing to transfer -INFO : - Path1 Resync is copying files to - Path2 -INFO : There was nothing to transfer -INFO : Resync updating listings -INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" -INFO : Bisync successful (04) : test changed on both paths - file5 (file5R, file5L) (05) : touch-glob 2001-01-02 {datadir/} file5R.txt @@ -32,42 +13,20 @@ INFO : Bisync successful (10) : test bisync with 50 files created during - should ignore new files (11) : test-func (12) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File changed: size (larger), time (newer) - file5.txt INFO : Path1: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file5.txt INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) -INFO : Applying changes -INFO : Checking potential conflicts... 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 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 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 (13) : test changed on both paths - file5 (file5R, file5L) (14) : touch-glob 2001-01-02 {datadir/} file5R.txt @@ -78,19 +37,6 @@ INFO : Bisync successful (18) : test next bisync - should now notice new files (19) : test-func (20) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File is new - file100.txt INFO : - Path1 File is new - file5.txt INFO : - Path1 File is new - file51.txt @@ -143,7 +89,6 @@ INFO : - Path1 File is new - f INFO : - Path1 File is new - file98.txt INFO : - Path1 File is new - file99.txt INFO : Path1: 51 changes:  51 new,  0 modified,  0 deleted -INFO : Path2 checking for diffs INFO : - Path2 File changed: size (larger), time (newer) - file1.txt INFO : - Path2 File changed: size (larger), time (newer) - file2.txt INFO : - Path2 File changed: size (larger), time (newer) - file3.txt @@ -196,12 +141,9 @@ INFO : - Path2 File is new - f INFO : - Path2 File is new - file9.txt INFO : Path2: 50 changes:  43 new,  7 modified,  0 deleted INFO : (Modified:  7 newer,  0 older,  7 larger,  0 smaller) -INFO : Applying changes -INFO : Checking potential conflicts... 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 INFO : - Path1 Queue copy to Path2 - {path2/}file100.txt NOTICE: - WARNING New or changed in both paths - file5.txt NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt.conflict3 @@ -306,11 +248,6 @@ INFO : - Path2 Queue copy to Path1 - { INFO : - Path2 Queue copy to Path1 - {path1/}file7.txt INFO : - Path2 Queue copy to Path1 - {path1/}file8.txt INFO : - Path2 Queue copy to Path1 - {path1/}file9.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 (21) : test changed on both paths - file5 (file5R, file5L) (22) : touch-glob 2001-01-02 {datadir/} file5R.txt @@ -321,37 +258,15 @@ INFO : Bisync successful (26) : test next bisync - should be no changes except dummy (27) : test-func (28) : bisync -INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. -INFO : Bisyncing with Comparison Settings: -{ -"Modtime": true, -"Size": true, -"Checksum": false, -"NoSlowHash": false, -"SlowHashSyncOnly": false, -"DownloadHash": false -} -INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" -INFO : Building Path1 and Path2 listings -INFO : Path1 checking for diffs INFO : - Path1 File is new - file5.txt INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Path2 checking for diffs INFO : - Path2 File is new - file5.txt INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted -INFO : Applying changes -INFO : Checking potential conflicts... 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 NOTICE: - WARNING New or changed in both paths - file5.txt NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt.conflict5 NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt.conflict5 NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt.conflict6 NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt.conflict6 -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