remove lock timeout, add test for lock

Author: dsa0x

sicher.go

@@ -16,7 +16,6 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
-	"time"
 
 	"github.com/juju/fslock"
 )
@@ -194,12 +193,14 @@ func (s *sicher) Edit(editor ...string) error {
 
 	// lock file to enable only one edit at a time
 	credFileLock := fslock.New(credFile.Name()) //newFileLock(credFile)
-	err = credFileLock.LockWithTimeout(time.Second * 10)
+	err = credFileLock.TryLock()
 	if err != nil {
+		if err == fslock.ErrLocked {
+			return fmt.Errorf("%s: File is in use in another terminal", err)
+		}
 		return fmt.Errorf("error locking file: %s", err)
 	}
 	defer credFileLock.Unlock()
-
 	var buf bytes.Buffer
 	_, err = io.Copy(&buf, credFile)
 	if err != nil {

sicher_test.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"sync"
 	"testing"
 )
 
@@ -95,6 +96,56 @@ func TestEditSuccess(t *testing.T) {
 		os.Remove(gitPath)
 	})
 }
+func TestEditFileLock(t *testing.T) {
+	oldExecCmd := execCmd
+	defer func() { execCmd = oldExecCmd }()
+	s, encPath, keyPath := setupTest()
+
+	s.Initialize(os.Stdin)
+	buf := bytes.Buffer{}
+
+	execCmd = func(cmd string, args ...string) *exec.Cmd {
+		stdIn, stdOut, stdErr = &buf, &buf, &buf
+
+		if cmd != "vim" {
+			t.Errorf("Expected command to be vim, got %s", cmd)
+		}
+		return exec.Command("cat", args...)
+	}
+
+	var wg sync.WaitGroup
+	chErr := make(chan error, 1)
+	for i := 0; i < 2; i++ {
+		wg.Add(1)
+		go func() {
+			err := s.Edit("vim")
+			if err != nil {
+				chErr <- err
+			}
+			wg.Done()
+		}()
+	}
+
+	wg.Wait()
+
+	select {
+	case err := <-chErr:
+		if err == nil {
+			t.Errorf("Expected file to be locked and exit error, got nil error")
+		}
+	default:
+		t.Errorf("Expected file to be locked and exit error, received no error")
+	}
+
+	// get path to the gitignore file and cleanup
+	gitPath := strings.Replace(encPath, fmt.Sprintf("%s.enc", s.Environment), ".gitignore", 1)
+
+	t.Cleanup(func() {
+		os.Remove(encPath)
+		os.Remove(keyPath)
+		os.Remove(gitPath)
+	})
+}
 
 func TestEditFail(t *testing.T) {
 	oldExecCmd := execCmd