From fbe746c26124858b286d04a5fca3145ff867d8d1 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sun, 16 Aug 2015 16:24:04 +0200
Subject: [PATCH] locks: fix testing stale locks created on other hosts

Closes #260
---
 lock.go      | 13 ++++++++++++
 lock_test.go | 57 +++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/lock.go b/lock.go
index c662f1718..2030ff9b6 100644
--- a/lock.go
+++ b/lock.go
@@ -206,6 +206,19 @@ func (l *Lock) Stale() bool {
 		return true
 	}
 
+	hn, err := os.Hostname()
+	if err != nil {
+		debug.Log("Lock.Stale", "unable to find current hostnanme: %v", err)
+		// since we cannot find the current hostname, assume that the lock is
+		// not stale.
+		return false
+	}
+
+	if hn != l.Hostname {
+		// lock was created on a different host, assume the lock is not stale.
+		return false
+	}
+
 	proc, err := os.FindProcess(l.PID)
 	defer proc.Release()
 	if err != nil {
diff --git a/lock_test.go b/lock_test.go
index a2b5cb2d3..9a561b6e8 100644
--- a/lock_test.go
+++ b/lock_test.go
@@ -93,7 +93,12 @@ func TestExclusiveLockOnLockedRepo(t *testing.T) {
 }
 
 func createFakeLock(repo *repository.Repository, t time.Time, pid int) (backend.ID, error) {
-	newLock := &restic.Lock{Time: t, PID: pid}
+	hostname, err := os.Hostname()
+	if err != nil {
+		return backend.ID{}, err
+	}
+
+	newLock := &restic.Lock{Time: t, PID: pid, Hostname: hostname}
 	return repo.SaveJSONUnpacked(backend.Lock, &newLock)
 }
 
@@ -102,42 +107,58 @@ func removeLock(repo *repository.Repository, id backend.ID) error {
 }
 
 var staleLockTests = []struct {
-	timestamp time.Time
-	stale     bool
-	pid       int
+	timestamp        time.Time
+	stale            bool
+	staleOnOtherHost bool
+	pid              int
 }{
 	{
-		timestamp: time.Now(),
-		stale:     false,
-		pid:       os.Getpid(),
+		timestamp:        time.Now(),
+		stale:            false,
+		staleOnOtherHost: false,
+		pid:              os.Getpid(),
 	},
 	{
-		timestamp: time.Now().Add(-time.Hour),
-		stale:     true,
-		pid:       os.Getpid(),
+		timestamp:        time.Now().Add(-time.Hour),
+		stale:            true,
+		staleOnOtherHost: true,
+		pid:              os.Getpid(),
 	},
 	{
-		timestamp: time.Now().Add(3 * time.Minute),
-		stale:     false,
-		pid:       os.Getpid(),
+		timestamp:        time.Now().Add(3 * time.Minute),
+		stale:            false,
+		staleOnOtherHost: false,
+		pid:              os.Getpid(),
 	},
 	{
-		timestamp: time.Now(),
-		stale:     true,
-		pid:       os.Getpid() + 500,
+		timestamp:        time.Now(),
+		stale:            true,
+		staleOnOtherHost: false,
+		pid:              os.Getpid() + 500,
 	},
 }
 
 func TestLockStale(t *testing.T) {
+	hostname, err := os.Hostname()
+	OK(t, err)
+
+	otherHostname := "other-" + hostname
+
 	for i, test := range staleLockTests {
 		lock := restic.Lock{
-			Time: test.timestamp,
-			PID:  test.pid,
+			Time:     test.timestamp,
+			PID:      test.pid,
+			Hostname: hostname,
 		}
 
 		Assert(t, lock.Stale() == test.stale,
 			"TestStaleLock: test %d failed: expected stale: %v, got %v",
 			i, test.stale, !test.stale)
+
+		lock.Hostname = otherHostname
+		Assert(t, lock.Stale() == test.staleOnOtherHost,
+			"TestStaleLock: test %d failed: expected staleOnOtherHost: %v, got %v",
+			i, test.staleOnOtherHost, !test.staleOnOtherHost)
 	}
 }