mirror of
https://github.com/rclone/rclone.git
synced 2026-05-12 18:38:00 -04:00
c49015552c
Lockfiles with invalid JSON content caused bisync to fail permanently because lockFileIsExpired() logged the decode error but still fell through to the "valid lock file" path with zero-value TimeExpires. Now when a JSON decode error is detected: - If --max-lock is set (< basicallyforever): treat garbled lockfile as expired, mark listings failed, and proceed (safe assumption: the previous bisync run crashed and left garbage). - If --max-lock is not set (default): log a clear error telling the user the lockfile needs manual inspection, and return false.
81 lines
2.3 KiB
Go
81 lines
2.3 KiB
Go
package bisync
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/rclone/rclone/fs"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func newTestLockfileBisyncRun(t *testing.T, lockContent string, maxLock fs.Duration) *bisyncRun {
|
|
t.Helper()
|
|
dir := t.TempDir()
|
|
lockPath := filepath.Join(dir, "test.lck")
|
|
require.NoError(t, os.WriteFile(lockPath, []byte(lockContent), 0600))
|
|
|
|
listing1 := filepath.Join(dir, "listing1")
|
|
listing2 := filepath.Join(dir, "listing2")
|
|
require.NoError(t, os.WriteFile(listing1, []byte(""), 0600))
|
|
require.NoError(t, os.WriteFile(listing2, []byte(""), 0600))
|
|
|
|
return &bisyncRun{
|
|
lockFile: lockPath,
|
|
opt: &Options{MaxLock: maxLock},
|
|
listing1: listing1,
|
|
listing2: listing2,
|
|
}
|
|
}
|
|
|
|
func TestLockfileIsExpired_UnreadableWithMaxLock(t *testing.T) {
|
|
b := newTestLockfileBisyncRun(t, "not json!!!", fs.Duration(5*time.Minute))
|
|
assert.True(t, b.lockFileIsExpired(), "unreadable lockfile with --max-lock set should be treated as expired")
|
|
}
|
|
|
|
func TestLockfileIsExpired_UnreadableWithoutMaxLock(t *testing.T) {
|
|
b := newTestLockfileBisyncRun(t, "not json!!!", basicallyforever)
|
|
assert.False(t, b.lockFileIsExpired(), "unreadable lockfile without --max-lock should not be treated as expired")
|
|
}
|
|
|
|
func TestLockfileIsExpired_ValidExpired(t *testing.T) {
|
|
data := struct {
|
|
Session string
|
|
PID string
|
|
TimeRenewed time.Time
|
|
TimeExpires time.Time
|
|
}{
|
|
Session: "test",
|
|
PID: "12345",
|
|
TimeRenewed: time.Now().Add(-10 * time.Minute),
|
|
TimeExpires: time.Now().Add(-5 * time.Minute),
|
|
}
|
|
content, err := json.Marshal(data)
|
|
require.NoError(t, err)
|
|
|
|
b := newTestLockfileBisyncRun(t, string(content), fs.Duration(5*time.Minute))
|
|
assert.True(t, b.lockFileIsExpired(), "valid lockfile with past expiry should be expired")
|
|
}
|
|
|
|
func TestLockfileIsExpired_ValidNotExpired(t *testing.T) {
|
|
data := struct {
|
|
Session string
|
|
PID string
|
|
TimeRenewed time.Time
|
|
TimeExpires time.Time
|
|
}{
|
|
Session: "test",
|
|
PID: "12345",
|
|
TimeRenewed: time.Now(),
|
|
TimeExpires: time.Now().Add(10 * time.Minute),
|
|
}
|
|
content, err := json.Marshal(data)
|
|
require.NoError(t, err)
|
|
|
|
b := newTestLockfileBisyncRun(t, string(content), fs.Duration(5*time.Minute))
|
|
assert.False(t, b.lockFileIsExpired(), "valid lockfile with future expiry should not be expired")
|
|
}
|