Skip to content

Commit b826e02

Browse files
Zhiqiang Fangclaude
andcommitted
test: address review feedback on getConfigDaemonPod
- Return errors from label/field parsing and list operations instead of asserting, making the function fully safe for use in Eventually - Propagate error from getConfigDaemonPod in runCommandOnConfigDaemon instead of asserting, following idiomatic Go error handling Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 3cdedb9 commit b826e02

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

test/conformance/tests/test_sriov_operator.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1967,11 +1967,17 @@ func createVanillaNetworkPolicy(node string, sriovInfos *cluster.EnabledNodes, n
19671967
func getConfigDaemonPod(nodeName string) (*corev1.Pod, error) {
19681968
pods := &corev1.PodList{}
19691969
label, err := labels.Parse("app=sriov-network-config-daemon")
1970-
Expect(err).ToNot(HaveOccurred())
1970+
if err != nil {
1971+
return nil, err
1972+
}
19711973
field, err := fields.ParseSelector(fmt.Sprintf("spec.nodeName=%s", nodeName))
1972-
Expect(err).ToNot(HaveOccurred())
1974+
if err != nil {
1975+
return nil, err
1976+
}
19731977
err = clients.List(context.Background(), pods, &runtimeclient.ListOptions{Namespace: operatorNamespace, LabelSelector: label, FieldSelector: field})
1974-
Expect(err).ToNot(HaveOccurred())
1978+
if err != nil {
1979+
return nil, err
1980+
}
19751981
if len(pods.Items) != 1 {
19761982
return nil, fmt.Errorf("expected 1 config daemon pod on node %s, got %d", nodeName, len(pods.Items))
19771983
}
@@ -1980,9 +1986,10 @@ func getConfigDaemonPod(nodeName string) (*corev1.Pod, error) {
19801986

19811987
func runCommandOnConfigDaemon(nodeName string, command ...string) (string, string, error) {
19821988
daemonPod, err := getConfigDaemonPod(nodeName)
1983-
Expect(err).ToNot(HaveOccurred())
1984-
output, errOutput, err := pod.ExecCommand(clients, daemonPod, command...)
1985-
return output, errOutput, err
1989+
if err != nil {
1990+
return "", "", err
1991+
}
1992+
return pod.ExecCommand(clients, daemonPod, command...)
19861993
}
19871994

19881995
func defaultFilterPolicy(policy sriovv1.SriovNetworkNodePolicy) bool {

0 commit comments

Comments
 (0)