Worker: fix timezone-dependent tests
The tests were already made timezone-independent, but in a way that assumed the day would still be the same and only the time would be different. Now that assumption is removed as well.
This commit is contained in:
parent
6a74e49e3d
commit
70c88a95e3
@ -85,7 +85,7 @@ func TestCmdMoveDirectoryExistingDest(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// This cannot be a hard-coded string, as the test would fail in other timezones.
|
// This cannot be a hard-coded string, as the test would fail in other timezones.
|
||||||
backupDir := destPath + "-2006-01-02_" + mtime.Local().Format("150405")
|
backupDir := destPath + "-" + mtime.Local().Format("2006-01-02_150405")
|
||||||
|
|
||||||
// Just a sanity check.
|
// Just a sanity check.
|
||||||
ts, err := timestampedPath(destPath)
|
ts, err := timestampedPath(destPath)
|
||||||
@ -122,7 +122,7 @@ func TestCmdMoveDirectoryExistingDestAndBackup(t *testing.T) {
|
|||||||
fileCreateEmpty(filepath.Join(destPath, "destfile.txt"))
|
fileCreateEmpty(filepath.Join(destPath, "destfile.txt"))
|
||||||
|
|
||||||
// This cannot be a hard-coded string, as the test would fail in other timezones.
|
// This cannot be a hard-coded string, as the test would fail in other timezones.
|
||||||
backupDir := destPath + "-2006-01-02_" + mtime.Local().Format("150405")
|
backupDir := destPath + "-" + mtime.Local().Format("2006-01-02_150405")
|
||||||
ensureDirExists(backupDir)
|
ensureDirExists(backupDir)
|
||||||
ensureDirExists(backupDir + "-046")
|
ensureDirExists(backupDir + "-046")
|
||||||
fileCreateEmpty(filepath.Join(backupDir, "backupfile.txt"))
|
fileCreateEmpty(filepath.Join(backupDir, "backupfile.txt"))
|
||||||
@ -169,7 +169,7 @@ func TestTimestampedPathFile(t *testing.T) {
|
|||||||
newpath, err := timestampedPath("somefile.txt")
|
newpath, err := timestampedPath("somefile.txt")
|
||||||
|
|
||||||
// This cannot be a hard-coded string, as the test would fail in other timezones.
|
// This cannot be a hard-coded string, as the test would fail in other timezones.
|
||||||
expect := fmt.Sprintf("somefile.txt-2006-01-02_%s", mtime.Local().Format("150405"))
|
expect := "somefile.txt-" + mtime.Local().Format("2006-01-02_150405")
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Equal(t, expect, newpath)
|
assert.Equal(t, expect, newpath)
|
||||||
@ -192,7 +192,7 @@ func TestTimestampedPathDir(t *testing.T) {
|
|||||||
newpath, err := timestampedPath("somedir")
|
newpath, err := timestampedPath("somedir")
|
||||||
|
|
||||||
// This cannot be a hard-coded string, as the test would fail in other timezones.
|
// This cannot be a hard-coded string, as the test would fail in other timezones.
|
||||||
expect := fmt.Sprintf("somedir-2006-01-02_%s", mtime.Local().Format("150405"))
|
expect := "somedir-" + mtime.Local().Format("2006-01-02_150405")
|
||||||
|
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Equal(t, expect, newpath)
|
assert.Equal(t, expect, newpath)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user