test/thirdparty: revert changes to packages_test

tests/thirdparty/packages_test.go

@@ -60,7 +60,6 @@ type PackageTest struct {
 	Latest  bool   // use latest version of the package
 
 	repopath string // path the repo is cloned to
-	cwd      string // working directory to execute commands in
 }
 
 // Run the test.
@@ -80,7 +79,6 @@ func (t *PackageTest) checkout() {
 	dst := filepath.Join(t.WorkDir, t.Name())
 	t.git("clone", "--quiet", t.CloneURL(), dst)
 	t.repopath = dst
-	t.cd(t.repopath)
 
 	// Checkout specific version.
 	if t.Latest {
@@ -105,7 +103,6 @@ func (t *PackageTest) modinit() {
 
 // replaceavo points all avo dependencies to the local version.
 func (t *PackageTest) replaceavo() {
-
 	// Determine the path to avo.
 	_, self, _, ok := runtime.Caller(1)
 	if !ok {
@@ -118,22 +115,15 @@ func (t *PackageTest) replaceavo() {
 		if err != nil {
 			return err
 		}
-		dir, base := filepath.Split(path)
-		if base != "go.mod" {
+		if filepath.Base(path) != "go.mod" {
 			return nil
 		}
-		t.cd(dir)
-		t.gotool("mod", "tidy")
-		t.gotool("get", "github.com/mmcloughlin/avo")
-		t.gotool("mod", "edit", "-replace=github.com/mmcloughlin/avo="+avodir)
-		t.gotool("mod", "download")
+		t.gotool("mod", "edit", "-replace=github.com/mmcloughlin/avo="+avodir, path)
 		return nil
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	t.cd(t.repopath)
 }
 
 // generate runs generate commands.
@@ -166,11 +156,6 @@ func (t *PackageTest) git(arg ...string) {
 // gotool runs a go command.
 func (t *PackageTest) gotool(arg ...string) {
 	cmd := exec.Command(test.GoTool(), arg...)
-	cmd.Dir = t.cwd
+	cmd.Dir = t.repopath
 	test.ExecCommand(t.T, cmd)
 }
-
-// cd sets the working directory.
-func (t *PackageTest) cd(dir string) {
-	t.cwd = dir
-}