-
Notifications
You must be signed in to change notification settings - Fork 10.2k
tests: migrate KV semantics (e2e/ctl_v3_kv) to common test framework #20730
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
e0de3a2
89d6a0f
8fb1682
309efa5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| 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) { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
| }) | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,6 +38,7 @@ type GetOptions struct { | |
| Order clientv3.SortOrder | ||
| SortBy clientv3.SortTarget | ||
| Timeout time.Duration | ||
| KeysOnly bool | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
||
| } | ||
|
|
||
| type PutOptions struct { | ||
|
|
||
There was a problem hiding this comment.
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.