Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions tests/common/v3_kv_test.go
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of creating a new file, we can add tests in tests/common/kv_test.go.

Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// Copyright 2025 The etcd Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package common

import (
"context"
"testing"
"time"

"github.com/stretchr/testify/require"

"go.etcd.io/etcd/tests/v3/framework/config"
"go.etcd.io/etcd/tests/v3/framework/testutils"
)

func TestKV_PutTimeout(t *testing.T) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the matching e2e that its being migrated

testRunner.BeforeTest(t)
for _, tc := range clusterTestCases() {
t.Run(tc.name, func(t *testing.T) {
ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second) // Short timeout to test timeout behavior
defer cancel()

clus := testRunner.NewCluster(ctx, t, config.WithClusterConfig(tc.config))
defer clus.Close()
client := testutils.MustClient(clus.Client())

key, value := "foo", "bar"

// Put operation - should work within timeout
err := client.Put(ctx, key, value, config.PutOptions{})
// don't require.NoError here because timeout behavior may vary
// test validates that the client handles timeouts gracefully
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the current state of PR you don't set lower timeout, but use the default one. This means we should not expect an timeout. Please add validation of error.


if err == nil {
// If put succeeded, verify with get
getResp, getErr := client.Get(ctx, key, config.GetOptions{})
if getErr == nil {
require.Equal(t, getResp.Kvs, 1)
require.Equal(t, value, string(getResp.Kvs[0].Value))
}
}
// If timeout occurred, that's also acceptable behavior for this test
})
}
}
1 change: 0 additions & 1 deletion tests/e2e/ctl_v3_kv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"go.etcd.io/etcd/tests/v3/framework/e2e"
)

func TestCtlV3PutTimeout(t *testing.T) { testCtl(t, putTest, withDefaultDialTimeout()) }
func TestCtlV3PutClientTLSFlagByEnv(t *testing.T) {
testCtl(t, putTest, withCfg(*e2e.NewConfigClientTLS()), withFlagByEnv())
}
Expand Down
1 change: 1 addition & 0 deletions tests/framework/config/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type GetOptions struct {
Order clientv3.SortOrder
SortBy clientv3.SortTarget
Timeout time.Duration
KeysOnly bool
Copy link
Member

@serathius serathius Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not enough to just add a field to options, you need to implement it. Don't think you use KeysOnly in the current PR. You can just remove it for now.

}

type PutOptions struct {
Expand Down