qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 02:47:58 -07:00
Code Releases Activity

text/template: drop reference to os.EPERM in the test

Browse Source 
R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/5654077
This commit is contained in:
Rob Pike 2012-02-14 07:11:39 +11:00
parent 28ffb38f4a
commit 47424d90ec
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pkg/text/template/exec_test.go
View File

@ -9,7 +9,6 @@ import (
"errors"
"flag"
"fmt"
"os"
"reflect"
"strings"
"testing"
@ -168,10 +167,12 @@ func (t *T) MAdd(a int, b []int) []int {
return v
}
// EPERM returns a value and an error according to its argument.
func (t *T) EPERM(error bool) (bool, error) {
var myError = errors.New("my error")
// MyError returns a value and an error according to its argument.
func (t *T) MyError(error bool) (bool, error) {
if error {
return true, os.EPERM
return true, myError
}
return false, nil
}
@ -417,8 +418,8 @@ var execTests = []execTest{
{"or as if false", `{{or .SIEmpty "slice is empty"}}`, "slice is empty", tVal, true},
// Error handling.
{"error method, error", "{{.EPERM true}}", "", tVal, false},
{"error method, no error", "{{.EPERM false}}", "false", tVal, true},
{"error method, error", "{{.MyError true}}", "", tVal, false},
{"error method, no error", "{{.MyError false}}", "false", tVal, true},
// Fixed bugs.
// Must separate dot and receiver; otherwise args are evaluated with dot set to variable.
@ -565,18 +566,18 @@ func TestDelims(t *testing.T) {
func TestExecuteError(t *testing.T) {
b := new(bytes.Buffer)
tmpl := New("error")
_, err := tmpl.Parse("{{.EPERM true}}")
_, err := tmpl.Parse("{{.MyError true}}")
if err != nil {
t.Fatalf("parse error: %s", err)
}
err = tmpl.Execute(b, tVal)
if err == nil {
t.Errorf("expected error; got none")
} else if !strings.Contains(err.Error(), os.EPERM.Error()) {
} else if !strings.Contains(err.Error(), myError.Error()) {
if *debug {
fmt.Printf("test execute error: %s\n", err)
}
t.Errorf("expected os.EPERM; got %s", err)
t.Errorf("expected myError; got %s", err)
}
}