Merge branch 'main' into RT-1.32

openconfig · Aug 19, 2024 · 6282a97 · 6282a97
2 parents 74bf297 + 4e74047
commit 6282a97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/..._tests/hierarchical_weight_resolution_pbf_test/hierarchical_weight_resolution_pbf_test.go b/..._tests/hierarchical_weight_resolution_pbf_test/hierarchical_weight_resolution_pbf_test.go
@@ -295,7 +295,7 @@ func (a *attributes) configInterfaceDUT(t *testing.T, d *ondatra.DUTDevice) {
 
 	a.configSubinterfaceDUT(t, i, d)
 	intfPath := gnmi.OC().Interface(p.Name())
-	gnmi.Replace(t, d, intfPath.Config(), i)
+	gnmi.Update(t, d, intfPath.Config(), i)
 	fptest.LogQuery(t, "DUT", intfPath.Config(), gnmi.Get(t, d, intfPath.Config()))
 }
 

diff --git a/internal/core/core.go b/internal/core/core.go
@@ -20,6 +20,7 @@ package core
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"regexp"
 	"sync"
@@ -212,7 +213,7 @@ func registerAfter(_ *eventlis.AfterTestsEvent) error {
 	glog.Infof(msg)
 	ondatra.Report().AddSuiteProperty("validator.core.end", report)
 	if foundCores {
-		return fmt.Errorf(msg)
+		return errors.New(msg)
 	}
 	return nil
 }

diff --git a/tools/internal/ocpaths/ocpaths_test.go b/tools/internal/ocpaths/ocpaths_test.go
@@ -164,7 +164,7 @@ func TestValidatePath(t *testing.T) {
 
 			err := validatePath(ocpath, root)
 			if diff := errdiff.Substring(err, tt.wantErrSubstr); diff != "" {
-				t.Errorf(diff)
+				t.Error(diff)
 			}
 
 			if err != nil {