From 5b21d67a495a315344cafe6e6318febb6ba0f713 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 19 Aug 2015 20:25:59 +0200 Subject: [PATCH] lock_test: correct merge error, use offset 500k --- lock_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lock_test.go b/lock_test.go index 8bac2362b..6890c44da 100644 --- a/lock_test.go +++ b/lock_test.go @@ -134,7 +134,7 @@ var staleLockTests = []struct { timestamp: time.Now(), stale: true, staleOnOtherHost: false, - pid: os.Getpid() + 500, + pid: os.Getpid() + 500000, }, } @@ -204,7 +204,7 @@ func TestRemoveAllLocks(t *testing.T) { id2, err := createFakeLock(repo, time.Now().Add(-time.Minute), os.Getpid()) OK(t, err) - id3, err := createFakeLock(repo, time.Now().Add(-time.Minute), os.Getpid()+500) + id3, err := createFakeLock(repo, time.Now().Add(-time.Minute), os.Getpid()+500000) OK(t, err) OK(t, restic.RemoveAllLocks(repo))