internal/suggest: fix tests by using a temporary directory

stamblerre · Nov 27, 2018 · d613f6b · d613f6b
1 parent ace522f
commit d613f6b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/internal/suggest/suggest_test.go b/internal/suggest/suggest_test.go
@@ -87,7 +87,7 @@ func testRegress(t *testing.T, testDir string) {
 				return
 			}
 		} else if strings.HasSuffix(file.Name(), ".go.in") {
-			// Copy the test files to the temporary directory
+			// Copy the test files to the temporary directory and save information.
 			filename := filepath.Join(testDir, file.Name())
 			var err error
 			data, err = ioutil.ReadFile(filename)

diff --git a/server.go b/server.go
@@ -3,11 +3,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-<<<<<<< HEAD
-=======
-	"go/build"
-	"go/importer"
->>>>>>> gocode: fix a bug with gbroot
 	"log"
 	"net"
 	"net/rpc"