Add Lock tests

Author: kuujo

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/atomix/atomix/api v0.9.2
-	github.com/atomix/atomix/protocols/rsm v0.5.6
+	github.com/atomix/atomix/protocols/rsm v0.5.7
 	github.com/atomix/atomix/runtime v0.9.0
 	github.com/atomix/atomix/sidecar v0.4.4
 	github.com/gogo/protobuf v1.3.2

go.sum

@@ -4,8 +4,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/atomix/atomix/api v0.9.2 h1:BpT4zsXiKQWoIHQzGeCDQuC4BxcWvfrsMrPuUoSNLTI=
 github.com/atomix/atomix/api v0.9.2/go.mod h1:Fz8zXQH6n28U0NTu5xctKhkNrN5RsWgX56lrMhqXlPg=
-github.com/atomix/atomix/protocols/rsm v0.5.6 h1:55u/qIIUuLakypf1d1CQ5xxj/E720f6FRGDtv1VUOSs=
-github.com/atomix/atomix/protocols/rsm v0.5.6/go.mod h1:SgkK3PVLqx1KmNjxw8OY7AY7T6t6TuPLmnP6Rr/oFAQ=
+github.com/atomix/atomix/protocols/rsm v0.5.7 h1:hAaMCXT+F2DIN+e9B2r3nDPElJvEjCJE+llITVdy6jU=
+github.com/atomix/atomix/protocols/rsm v0.5.7/go.mod h1:SgkK3PVLqx1KmNjxw8OY7AY7T6t6TuPLmnP6Rr/oFAQ=
 github.com/atomix/atomix/runtime v0.9.0 h1:yDViPymoOkR5gMJkk25CZP2Tjf2j1JMAWNd/I38ws8I=
 github.com/atomix/atomix/runtime v0.9.0/go.mod h1:abB/WaP50Fm6MVi8CHRsfIOt8urDzcpQvMDFmhhlVgY=
 github.com/atomix/atomix/sidecar v0.4.4 h1:CjLPA3p1V83Tx2yxUGz4JLyQkeyXC8/1xXaiZVknJsY=

pkg/primitive/lock/client.go

@@ -10,6 +10,7 @@ import (
 	lockv1 "github.com/atomix/atomix/api/runtime/lock/v1"
 	runtimev1 "github.com/atomix/atomix/api/runtime/v1"
 	"github.com/atomix/go-sdk/pkg/primitive"
+	"time"
 )
 
 func newLocksClient(name string, client lockv1.LocksClient) primitive.Primitive {
@@ -59,6 +60,10 @@ func (l *lockClient) Lock(ctx context.Context, opts ...LockOption) (Version, err
 			Name: l.Name(),
 		},
 	}
+	if deadline, ok := ctx.Deadline(); ok {
+		timeout := time.Until(deadline)
+		request.Timeout = &timeout
+	}
 	for i := range opts {
 		opts[i].beforeLock(request)
 	}

pkg/primitive/lock/lock_test.go

@@ -0,0 +1,74 @@
+// SPDX-FileCopyrightText: 2023-present Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package lock
+
+import (
+	"context"
+	"github.com/atomix/atomix/runtime/pkg/logging"
+	"github.com/atomix/go-sdk/pkg/test"
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+func TestLock(t *testing.T) {
+	logging.SetLevel(logging.DebugLevel)
+
+	cluster := test.NewClient()
+	defer cluster.Close()
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+	defer cancel()
+
+	l1, err := NewBuilder(cluster, "test").Get(ctx)
+	assert.NoError(t, err)
+	l2, err := NewBuilder(cluster, "test").Get(ctx)
+	assert.NoError(t, err)
+
+	version, err := l1.Get(context.Background())
+	assert.Error(t, err)
+	assert.Equal(t, Version(0), version)
+
+	v1, err := l1.Lock(context.Background())
+	assert.NoError(t, err)
+	assert.NotEqual(t, Version(0), v1)
+
+	version, err = l1.Get(context.Background())
+	assert.NoError(t, err)
+	assert.Equal(t, v1, version)
+
+	version, err = l2.Get(context.Background())
+	assert.NoError(t, err)
+	assert.Equal(t, v1, version)
+
+	c := make(chan Version)
+	go func() {
+		version, err := l2.Lock(context.Background())
+		assert.NoError(t, err)
+		c <- version
+	}()
+
+	err = l1.Unlock(context.Background())
+	assert.NoError(t, err)
+
+	v2 := <-c
+
+	assert.NotEqual(t, v1, v2)
+
+	version, err = l1.Get(context.Background())
+	assert.NoError(t, err)
+	assert.Equal(t, v2, version)
+
+	version, err = l1.Get(context.Background())
+	assert.NoError(t, err)
+	assert.Equal(t, v2, version)
+
+	v2, err = l2.Lock(context.Background(), WithTimeout(1*time.Second))
+	assert.Error(t, err)
+	assert.Equal(t, Version(0), v2)
+
+	err = l1.Close(context.Background())
+	assert.NoError(t, err)
+}