From 9e200531b1490000656031c42fff4d95477e1b46 Mon Sep 17 00:00:00 2001 From: nielash Date: Sat, 30 Aug 2025 02:30:49 -0400 Subject: [PATCH] bisync: use unique stats groups on tests --- cmd/bisync/bisync_test.go | 4 ++-- cmd/bisync/testdata/test_all_changed/golden/test.log | 4 ++++ cmd/bisync/testdata/test_backupdir/golden/test.log | 2 ++ cmd/bisync/testdata/test_basic/golden/test.log | 2 ++ cmd/bisync/testdata/test_changes/golden/test.log | 2 ++ cmd/bisync/testdata/test_check_access/golden/test.log | 3 +++ .../testdata/test_check_access_filters/golden/test.log | 4 ++++ cmd/bisync/testdata/test_check_filename/golden/test.log | 4 ++++ cmd/bisync/testdata/test_check_sync/golden/test.log | 4 ++++ cmd/bisync/testdata/test_compare_all/golden/test.log | 2 ++ cmd/bisync/testdata/test_concurrent/golden/test.log | 2 ++ .../testdata/test_createemptysrcdirs/golden/test.log | 8 +++++++- cmd/bisync/testdata/test_dry_run/golden/test.log | 2 ++ cmd/bisync/testdata/test_equal/golden/test.log | 2 ++ cmd/bisync/testdata/test_ext_paths/golden/test.log | 6 ++++++ cmd/bisync/testdata/test_filters/golden/test.log | 2 ++ .../testdata/test_filtersfile_checks/golden/test.log | 6 ++++++ .../testdata/test_ignorelistingchecksum/golden/test.log | 4 ++++ cmd/bisync/testdata/test_max_delete_path1/golden/test.log | 3 +++ .../testdata/test_max_delete_path2_force/golden/test.log | 3 +++ cmd/bisync/testdata/test_nomodtime/golden/test.log | 2 ++ cmd/bisync/testdata/test_rclone_args/golden/test.log | 6 ++++++ cmd/bisync/testdata/test_resolve/golden/test.log | 2 ++ cmd/bisync/testdata/test_resync/golden/test.log | 1 + cmd/bisync/testdata/test_resync_modes/golden/test.log | 3 +++ cmd/bisync/testdata/test_rmdirs/golden/test.log | 3 +++ cmd/bisync/testdata/test_volatile/golden/test.log | 2 ++ 27 files changed, 85 insertions(+), 3 deletions(-) diff --git a/cmd/bisync/bisync_test.go b/cmd/bisync/bisync_test.go index 828c96021..8f7dbfa43 100644 --- a/cmd/bisync/bisync_test.go +++ b/cmd/bisync/bisync_test.go @@ -465,6 +465,7 @@ func (b *bisyncTest) runTestCase(ctx context.Context, t *testing.T, testCase str // Prepare initial content b.cleanupCase(ctx) + ctx = accounting.WithStatsGroup(ctx, random.String(8)) fstest.CheckListingWithPrecision(b.t, b.fs1, []fstest.Item{}, []string{}, b.fs1.Precision()) // verify starting from empty fstest.CheckListingWithPrecision(b.t, b.fs2, []fstest.Item{}, []string{}, b.fs2.Precision()) initFs, err := cache.Get(ctx, b.initDir) @@ -641,12 +642,11 @@ func (b *bisyncTest) cleanupCase(ctx context.Context) { _ = operations.Purge(ctx, b.fs1, "") _ = operations.Purge(ctx, b.fs2, "") _ = os.RemoveAll(b.workDir) - accounting.Stats(ctx).ResetCounters() } func (b *bisyncTest) runTestStep(ctx context.Context, line string) (err error) { var fsrc, fdst fs.Fs - accounting.Stats(ctx).ResetErrors() + ctx = accounting.WithStatsGroup(ctx, random.String(8)) b.logPrintf("%s %s", color(terminal.CyanFg, b.stepStr), color(terminal.BlueFg, line)) ci := fs.GetConfig(ctx) diff --git a/cmd/bisync/testdata/test_all_changed/golden/test.log b/cmd/bisync/testdata/test_all_changed/golden/test.log index cb74904c9..a29eefe0b 100644 --- a/cmd/bisync/testdata/test_all_changed/golden/test.log +++ b/cmd/bisync/testdata/test_all_changed/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -59,6 +61,7 @@ INFO : - Path1 Queue copy to Path2 - { 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 @@ -133,6 +136,7 @@ INFO : - Path1 Queue copy to Path2 - { 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 9a2913d58..b47a1ad51 100644 --- a/cmd/bisync/testdata/test_backupdir/golden/test.log +++ b/cmd/bisync/testdata/test_backupdir/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_basic/golden/test.log b/cmd/bisync/testdata/test_basic/golden/test.log index d3086e790..a253fa907 100644 --- a/cmd/bisync/testdata/test_basic/golden/test.log +++ b/cmd/bisync/testdata/test_basic/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_changes/golden/test.log b/cmd/bisync/testdata/test_changes/golden/test.log index df154542c..1fbc11cf9 100644 --- a/cmd/bisync/testdata/test_changes/golden/test.log +++ b/cmd/bisync/testdata/test_changes/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_check_access/golden/test.log b/cmd/bisync/testdata/test_check_access/golden/test.log index 4184a0f30..87979e862 100644 --- a/cmd/bisync/testdata/test_check_access/golden/test.log +++ b/cmd/bisync/testdata/test_check_access/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -87,6 +89,7 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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/}" 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 1f9e85721..f2fd5c2e5 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/test.log +++ b/cmd/bisync/testdata/test_check_access_filters/golden/test.log @@ -21,7 +21,9 @@ 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 @@ -136,7 +138,9 @@ 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 diff --git a/cmd/bisync/testdata/test_check_filename/golden/test.log b/cmd/bisync/testdata/test_check_filename/golden/test.log index 573976ede..6af9275b0 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/test.log +++ b/cmd/bisync/testdata/test_check_filename/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -90,7 +92,9 @@ 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 diff --git a/cmd/bisync/testdata/test_check_sync/golden/test.log b/cmd/bisync/testdata/test_check_sync/golden/test.log index 46a5f0ffc..477db33d8 100644 --- a/cmd/bisync/testdata/test_check_sync/golden/test.log +++ b/cmd/bisync/testdata/test_check_sync/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -102,7 +104,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_compare_all/golden/test.log b/cmd/bisync/testdata/test_compare_all/golden/test.log index 9f78dbf82..faf8f2f57 100644 --- a/cmd/bisync/testdata/test_compare_all/golden/test.log +++ b/cmd/bisync/testdata/test_compare_all/golden/test.log @@ -15,7 +15,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_concurrent/golden/test.log b/cmd/bisync/testdata/test_concurrent/golden/test.log index 35f894aed..3a39b641a 100644 --- a/cmd/bisync/testdata/test_concurrent/golden/test.log +++ b/cmd/bisync/testdata/test_concurrent/golden/test.log @@ -15,7 +15,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log b/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log index 83806af92..d8c02879a 100644 --- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log +++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log @@ -23,7 +23,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -80,7 +82,7 @@ INFO : Path2 checking for diffs INFO : Applying changes INFO : - Path1 Queue copy to Path2 - {path2/}subdir INFO : - Path1 Do queued copies to - Path2 -INFO : subdir: Making directory +INFO : There was nothing to transfer INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful @@ -124,6 +126,7 @@ INFO : Path2: 1 changes:  0 new,  0 modified,  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 @@ -148,7 +151,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -188,6 +193,7 @@ 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/}" diff --git a/cmd/bisync/testdata/test_dry_run/golden/test.log b/cmd/bisync/testdata/test_dry_run/golden/test.log index e42f0eab7..740a17100 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/test.log +++ b/cmd/bisync/testdata/test_dry_run/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_equal/golden/test.log b/cmd/bisync/testdata/test_equal/golden/test.log index 189fdb88b..ffc16b016 100644 --- a/cmd/bisync/testdata/test_equal/golden/test.log +++ b/cmd/bisync/testdata/test_equal/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_ext_paths/golden/test.log b/cmd/bisync/testdata/test_ext_paths/golden/test.log index d7f9f3327..e8562baa4 100644 --- a/cmd/bisync/testdata/test_ext_paths/golden/test.log +++ b/cmd/bisync/testdata/test_ext_paths/golden/test.log @@ -27,7 +27,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}測試Русский ěáñ/" with Path2 "{path2/}測試Русский ěáñ/" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -84,7 +86,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -174,7 +178,9 @@ 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 diff --git a/cmd/bisync/testdata/test_filters/golden/test.log b/cmd/bisync/testdata/test_filters/golden/test.log index 64e8298e9..b07d706eb 100644 --- a/cmd/bisync/testdata/test_filters/golden/test.log +++ b/cmd/bisync/testdata/test_filters/golden/test.log @@ -20,7 +20,9 @@ INFO : Using filters file {workdir/}filtersfile.flt INFO : Storing filters file hash to {workdir/}filtersfile.flt.{hashtype} INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log b/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log index 2f08581e9..d1bf2fa1f 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -81,7 +83,9 @@ 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 @@ -146,7 +150,9 @@ 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 diff --git a/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log b/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log index f54cd7baf..2254f4f2e 100644 --- a/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log +++ b/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -33,7 +35,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 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 42aff09c0..7661363ff 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/test.log +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -84,6 +86,7 @@ INFO : - Path2 Queue delete - { 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 1cc290994..2a3510427 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 @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -84,6 +86,7 @@ INFO : - Path1 Queue delete - { 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_nomodtime/golden/test.log b/cmd/bisync/testdata/test_nomodtime/golden/test.log index 5e3f57d98..6494e6f76 100644 --- a/cmd/bisync/testdata/test_nomodtime/golden/test.log +++ b/cmd/bisync/testdata/test_nomodtime/golden/test.log @@ -15,7 +15,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_rclone_args/golden/test.log b/cmd/bisync/testdata/test_rclone_args/golden/test.log index 81fef5ae8..89e096e8a 100644 --- a/cmd/bisync/testdata/test_rclone_args/golden/test.log +++ b/cmd/bisync/testdata/test_rclone_args/golden/test.log @@ -17,7 +17,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -115,7 +117,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -154,6 +158,7 @@ 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 @@ -171,6 +176,7 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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/}" diff --git a/cmd/bisync/testdata/test_resolve/golden/test.log b/cmd/bisync/testdata/test_resolve/golden/test.log index e0f56a959..27281e261 100644 --- a/cmd/bisync/testdata/test_resolve/golden/test.log +++ b/cmd/bisync/testdata/test_resolve/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 diff --git a/cmd/bisync/testdata/test_resync/golden/test.log b/cmd/bisync/testdata/test_resync/golden/test.log index 13a3bddcb..ad9740d33 100644 --- a/cmd/bisync/testdata/test_resync/golden/test.log +++ b/cmd/bisync/testdata/test_resync/golden/test.log @@ -39,6 +39,7 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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/}" diff --git a/cmd/bisync/testdata/test_resync_modes/golden/test.log b/cmd/bisync/testdata/test_resync_modes/golden/test.log index bdab6854d..1d89638f1 100644 --- a/cmd/bisync/testdata/test_resync_modes/golden/test.log +++ b/cmd/bisync/testdata/test_resync_modes/golden/test.log @@ -22,6 +22,7 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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/}" @@ -129,6 +130,7 @@ 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 @@ -158,6 +160,7 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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/}" diff --git a/cmd/bisync/testdata/test_rmdirs/golden/test.log b/cmd/bisync/testdata/test_rmdirs/golden/test.log index 4e6763801..12e6f0826 100644 --- a/cmd/bisync/testdata/test_rmdirs/golden/test.log +++ b/cmd/bisync/testdata/test_rmdirs/golden/test.log @@ -16,7 +16,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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 @@ -45,6 +47,7 @@ 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 diff --git a/cmd/bisync/testdata/test_volatile/golden/test.log b/cmd/bisync/testdata/test_volatile/golden/test.log index 53d59dd83..f4263e8ca 100644 --- a/cmd/bisync/testdata/test_volatile/golden/test.log +++ b/cmd/bisync/testdata/test_volatile/golden/test.log @@ -15,7 +15,9 @@ INFO : Bisyncing with Comparison Settings: INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying Path2 files to Path1 INFO : - Path2 Resync is copying files to - Path1 +INFO : 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