diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-08-03 16:54:35 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-08-03 16:54:35 +0200 |
| commit | e390fedde07591d46022b7da5692af3fc2e782c6 (patch) | |
| tree | af2eb5968edb6324ba4d6d5cbd623daddb57edda /src/pkg/rpc/jsonrpc/all_test.go | |
| parent | 041b8f207274852d514bcfa6e5941eefe61e9f60 (diff) | |
| parent | 28592ee1ea1f5cdffcf85472f9de0285d928cf12 (diff) | |
| download | golang-e390fedde07591d46022b7da5692af3fc2e782c6.tar.gz | |
Merge commit 'upstream/59' into debian-sid
Diffstat (limited to 'src/pkg/rpc/jsonrpc/all_test.go')
| -rw-r--r-- | src/pkg/rpc/jsonrpc/all_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pkg/rpc/jsonrpc/all_test.go b/src/pkg/rpc/jsonrpc/all_test.go index 764ee7ff3..c1a9e8ecb 100644 --- a/src/pkg/rpc/jsonrpc/all_test.go +++ b/src/pkg/rpc/jsonrpc/all_test.go @@ -35,7 +35,7 @@ func (t *Arith) Mul(args *Args, reply *Reply) os.Error { func (t *Arith) Div(args *Args, reply *Reply) os.Error { if args.B == 0 { - return os.ErrorString("divide by zero") + return os.NewError("divide by zero") } reply.C = args.A / args.B return nil @@ -51,9 +51,9 @@ func init() { func TestServer(t *testing.T) { type addResp struct { - Id interface{} "id" - Result Reply "result" - Error interface{} "error" + Id interface{} `json:"id"` + Result Reply `json:"result"` + Error interface{} `json:"error"` } cli, srv := net.Pipe() |