From f6a9ef9393126b25bf52e3fd8f5339acae9c2552 Mon Sep 17 00:00:00 2001 From: Rebecca Stambler Date: Tue, 16 Apr 2019 15:38:41 -0400 Subject: [PATCH] go/packages: fix broken test that checks errors Change-Id: Id9b1dc5e01a5b7eeca45448be0b7d7eef79fa928 Reviewed-on: https://go-review.googlesource.com/c/tools/+/172400 Run-TryBot: Rebecca Stambler Reviewed-by: Ian Cottrell --- go/packages/packages_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go index 9c33ebec..0d10533a 100644 --- a/go/packages/packages_test.go +++ b/go/packages/packages_test.go @@ -1726,9 +1726,14 @@ func testReturnErrorWhenUsingNonGoFiles(t *testing.T, exporter packagestest.Expo }}}) defer exported.Cleanup() config := packages.Config{} + want := "named files must be .go files" pkgs, err := packages.Load(&config, "a/a.go", "b/b.c") if err != nil { - t.Fatal(err) + // Check if the error returned is the one we expected. + if !strings.Contains(err.Error(), want) { + t.Fatalf("want error message: %s, got: %s", want, err.Error()) + } + return } if len(pkgs) != 1 || pkgs[0].PkgPath != "command-line-arguments" { t.Fatalf("packages.Load: want [command-line-arguments], got %v", pkgs) @@ -1737,7 +1742,6 @@ func testReturnErrorWhenUsingNonGoFiles(t *testing.T, exporter packagestest.Expo t.Fatalf("result of Load: want package with one error, got: %+v", pkgs[0]) } got := pkgs[0].Errors[0].Error() - want := "named files must be .go files" if !strings.Contains(got, want) { t.Fatalf("want error message: %s, got: %s", want, got) }