Merge branch 'master' into fix-test-execution-in-forks

This commit is contained in:
Mat Ryer 2017-07-31 14:59:37 +01:00 committed by GitHub
commit 463b834355

View File

@ -196,10 +196,20 @@ func TestVendoredPackages(t *testing.T) {
// TestDotImports tests for https://github.com/matryer/moq/issues/21. // TestDotImports tests for https://github.com/matryer/moq/issues/21.
func TestDotImports(t *testing.T) { func TestDotImports(t *testing.T) {
err := os.Chdir("testpackages/dotimport") preDir, err := os.Getwd()
if err != nil {
t.Errorf("Getwd: %s", err)
}
err = os.Chdir("testpackages/dotimport")
if err != nil { if err != nil {
t.Errorf("Chdir: %s", err) t.Errorf("Chdir: %s", err)
} }
defer func() {
err := os.Chdir(preDir)
if err != nil {
t.Errorf("Chdir back: %s", err)
}
}()
m, err := New(".", "moqtest_test") m, err := New(".", "moqtest_test")
if err != nil { if err != nil {
t.Fatalf("moq.New: %s", err) t.Fatalf("moq.New: %s", err)