Skip to content

Commit 5bfd5e8

Browse files
committed
fix: go1.3 not os.WriteFile
1 parent 2b6d368 commit 5bfd5e8

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

cmd/cover.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ goc cover --center=http://127.0.0.1:7777 --target=/path/to/target --mode=atomic
4343
}
4444

4545
func runCover(target string) {
46-
var buildFlags string
47-
buildFlags = viper.GetString("buildflags")
46+
buildFlags := viper.GetString("buildflags")
4847
ci := &cover.CoverInfo{
4948
Args: buildFlags,
5049
GoPath: "",

cmd/cover_test.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,26 @@ func TestCoverSuccess(t *testing.T) {
2929
assert.NoError(t, err)
3030
defer os.RemoveAll(workingDir)
3131

32-
os.WriteFile(workingDir+"/main.go", mainContent, 0644)
33-
os.WriteFile(workingDir+"/go.mod", goModContent, 0644)
32+
err = writeFile(workingDir+"/main.go", mainContent)
33+
assert.NoError(t, err)
34+
err = writeFile(workingDir+"/go.mod", goModContent)
35+
assert.NoError(t, err)
3436
os.Setenv("GO111MODULE", "on")
3537

3638
runCover(workingDir)
3739

3840
_, err = os.Lstat(workingDir + "/http_cover_apis_auto_generated.go")
3941
assert.Equal(t, err, nil, "the generate file should be generated.")
4042
}
43+
44+
func writeFile(name string, data []byte) error {
45+
f, err := os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
46+
if err != nil {
47+
return err
48+
}
49+
_, err = f.Write(data)
50+
if err1 := f.Close(); err1 != nil && err == nil {
51+
err = err1
52+
}
53+
return err
54+
}

pkg/cover/instrument.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,16 @@ func clearFileCover(counter []uint32) {
131131
}
132132
133133
func registerHandlers() {
134+
{{if .Singleton}}
135+
ln, _, err := listen()
136+
{{else}}
134137
ln, host, err := listen()
138+
{{end}}
135139
if err != nil {
136140
log.Fatalf("listen failed, err:%v", err)
137141
}
138-
profileAddr := "http://" + host
139-
log.Printf("[goc] goc profile address: %s \n", profileAddr)
140142
{{if not .Singleton}}
143+
profileAddr := "http://" + host
141144
if resp, err := registerSelf(profileAddr); err != nil {
142145
log.Fatalf("register address %v failed, err: %v, response: %v", profileAddr, err, string(resp))
143146
}

0 commit comments

Comments
 (0)