featu(packagesdriver): add _test suffix to pkgPath

bazel-contrib · Dec 5, 2023 · 37ba8d5 · 37ba8d5
1 parent 499f609
commit 37ba8d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/go/tools/gopackagesdriver/flatpackage.go b/go/tools/gopackagesdriver/flatpackage.go
@@ -154,7 +154,7 @@ func (fp *FlatPackage) MoveTestFiles() *FlatPackage {
 	return &FlatPackage{
 		ID:              fp.ID + "_xtest",
 		Name:            fp.Name + "_test",
-		PkgPath:         fp.PkgPath,
+		PkgPath:         fp.PkgPath + "_test",
 		Imports:         newImports,
 		Errors:          fp.Errors,
 		GoFiles:         append([]string{}, xtgf...),

diff --git a/tests/integration/gopackagesdriver/gopackagesdriver_test.go b/tests/integration/gopackagesdriver/gopackagesdriver_test.go
@@ -175,6 +175,9 @@ func TestExternalTests(t *testing.T) {
 
 	for _, p := range resp.Packages {
 		if p.ID == xTestId {
+			if !strings.HasSuffix(p.PkgPath, "_test") {
+				t.Errorf("PkgPath missing _test suffix")
+			}
 			assertSuffixesInList(t, p.GoFiles, "/hello_external_test.go")
 		} else if p.ID == testId {
 			assertSuffixesInList(t, p.GoFiles, "/hello.go", "/hello_test.go")