"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
bisync: fix time.Local data race on tests - fixes #8272
nielashfc5bd21e28fe
diff --git a/cmd/bisync/bisync_test.go b/cmd/bisync/bisync_test.goindex 2cee02f28..b4ed0fe93 100644--- a/cmd/bisync/bisync_test.go+++ b/cmd/bisync/bisync_test.go@@ -226,6 +226,7 @@ var color = bisync.Color// TestMain drives the testsfunc TestMain(m *testing.M) {+ bisync.LogTZ = time.UTCfstest.TestMain(m)}@@ -277,7 +278,6 @@ func testBisync(t *testing.T, path1, path2 string) {ci.RefreshTimes = true}bisync.Colors = true- time.Local = bisync.TZci.FsCacheExpireDuration = fs.Duration(5 * time.Hour)baseDir, err := os.Getwd()diff --git a/cmd/bisync/listing.go b/cmd/bisync/listing.goindex 7451a5cbb..1aa1e9a62 100644--- a/cmd/bisync/listing.go+++ b/cmd/bisync/listing.go@@ -42,10 +42,14 @@ var lineRegex = regexp.MustCompile(`^(\S) +(-?\d+) (\S+) (\S+) (\d{4}-\d\d-\d\dT// timeFormat defines time format used in listingsconst timeFormat = "2006-01-02T15:04:05.000000000-0700"-// TZ defines time zone used in listingsvar (+ // TZ defines time zone used in listingsTZ = time.UTCtzLocal = false++ // LogTZ defines time zone used in logs (which may be different than that used in listings).+ // time.Local by default, but we force UTC on tests to make them deterministic regardless of tester's location.+ LogTZ = time.Local)// fileInfo describes a filediff --git a/cmd/bisync/resolve.go b/cmd/bisync/resolve.goindex b3e5d8048..21624580d 100644--- a/cmd/bisync/resolve.go+++ b/cmd/bisync/resolve.go@@ -380,26 +380,26 @@ func (b *bisyncRun) resolveNewerOlder(t1, t2 time.Time, remote1, remote2 string,}if t1.After(t2) {if prefer == PreferNewer {- fs.Infof(remote1, "Path1 is newer. Path1: %v, Path2: %v, Difference: %s", t1.Local(), t2.Local(), t1.Sub(t2))+ fs.Infof(remote1, "Path1 is newer. Path1: %v, Path2: %v, Difference: %s", t1.In(LogTZ), t2.In(LogTZ), t1.Sub(t2))return 1} else if prefer == PreferOlder {- fs.Infof(remote1, "Path2 is older. Path1: %v, Path2: %v, Difference: %s", t1.Local(), t2.Local(), t1.Sub(t2))+ fs.Infof(remote1, "Path2 is older. Path1: %v, Path2: %v, Difference: %s", t1.In(LogTZ), t2.In(LogTZ), t1.Sub(t2))return 2}} else if t1.Before(t2) {if prefer == PreferNewer {- fs.Infof(remote1, "Path2 is newer. Path1: %v, Path2: %v, Difference: %s", t1.Local(), t2.Local(), t2.Sub(t1))+ fs.Infof(remote1, "Path2 is newer. Path1: %v, Path2: %v, Difference: %s", t1.In(LogTZ), t2.In(LogTZ), t2.Sub(t1))return 2} else if prefer == PreferOlder {- fs.Infof(remote1, "Path1 is older. Path1: %v, Path2: %v, Difference: %s", t1.Local(), t2.Local(), t2.Sub(t1))+ fs.Infof(remote1, "Path1 is older. Path1: %v, Path2: %v, Difference: %s", t1.In(LogTZ), t2.In(LogTZ), t2.Sub(t1))return 1}}if t1.Equal(t2) {- fs.Infof(remote1, "Winner cannot be determined as times are equal. Path1: %v, Path2: %v, Difference: %s", t1.Local(), t2.Local(), t2.Sub(t1))+ fs.Infof(remote1, "Winner cannot be determined as times are equal. Path1: %v, Path2: %v, Difference: %s", t1.In(LogTZ), t2.In(LogTZ), t2.Sub(t1))return 0}- fs.Errorf(remote1, "Winner cannot be determined. Path1: %v, Path2: %v", t1.Local(), t2.Local()) // shouldn't happen unless prefer is of wrong type+ fs.Errorf(remote1, "Winner cannot be determined. Path1: %v, Path2: %v", t1.In(LogTZ), t2.In(LogTZ)) // shouldn't happen unless prefer is of wrong typereturn 0}