More review comments

Signed-off-by: Cornelius Weig <[email protected]>
GoogleContainerTools · Jul 22, 2019 · 0875984 · 0875984
1 parent f5ee229
commit 0875984
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/integration/sync_test.go b/integration/sync_test.go
@@ -95,13 +95,13 @@ func TestDevSyncAPITrigger(t *testing.T) {
 	ns, k8sclient, deleteNs := SetupNamespace(t)
 	defer deleteNs()
 
-	skaffold.Build().InDir("testdata/file-sync").InNs(ns.Name).RunOrFail(t)
+	skaffold.Build().InDir("testdata/file-sync").WithConfig("skaffold-manual.yaml").InNs(ns.Name).RunOrFail(t)
 
 	rpcAddr := randomPort()
 	client, shutdown := setupRPCClient(t, rpcAddr)
 	defer shutdown()
 
-	stop := skaffold.Dev("--auto-sync=false", "--rpc-port", rpcAddr).InDir("testdata/file-sync").InNs(ns.Name).RunBackground(t)
+	stop := skaffold.Dev("--auto-sync=false", "--rpc-port", rpcAddr).InDir("testdata/file-sync").WithConfig("skaffold-manual.yaml").InNs(ns.Name).RunBackground(t)
 	defer stop()
 
 	k8sclient.WaitForPodsReady("test-file-sync")

diff --git a/pkg/skaffold/sync/sync.go b/pkg/skaffold/sync/sync.go
@@ -115,14 +115,14 @@ func inferredSyncItem(a *latest.Artifact, e filemon.Events, builds []build.Artif
 
 	syncMap, err := provider()
 	if err != nil {
-		return nil, errors.Wrapf(err, "infer syncmap for image %s", a.ImageName)
+		return nil, errors.Wrapf(err, "inferring syncmap for image %s", a.ImageName)
 	}
 
 	toCopy := make(map[string][]string)
 	for _, f := range append(e.Modified, e.Added...) {
 		relPath, err := filepath.Rel(a.Workspace, f)
 		if err != nil {
-			return nil, errors.Wrapf(err, "changed file %s can't be found relative to context %s", f, a.Workspace)
+			return nil, errors.Wrapf(err, "finding changed file %s relative to context %s", f, a.Workspace)
 		}
 
 		matches := false