fixup! Make some progress...

ammario · ammario · commit b39628a5c50d · 2023-02-22T18:26:21.000Z
diff --git a/cli/templatepull_test.go b/cli/templatepull_test.go
@@ -194,7 +194,12 @@ func TestTemplatePull(t *testing.T) {
 		pty.ExpectMatch("not empty")
 		pty.WriteLine("no")
 
-		require.NoError(t, <-errChan)
+		require.Error(t, <-errChan)
+
+		ents, err := os.ReadDir(conflictDest)
+		require.NoError(t, err)
+
+		require.Len(t, ents, 1, "conflict folder should have single conflict file")
 	})
 }
 
