diff options
| author | Robert Griesemer <gri@golang.org> | 2009-12-15 15:41:46 -0800 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2009-12-15 15:41:46 -0800 |
| commit | 3743fa38e180c74c51aae84eda082067e8e12523 (patch) | |
| tree | 274d1d9bf832b7834ab60c65acdf945576271d14 /src/pkg/syslog/syslog_test.go | |
| parent | 13ac778ef2f757c7cd636b4336a2bd6c8f403b43 (diff) | |
| download | golang-3743fa38e180c74c51aae84eda082067e8e12523.tar.gz | |
1) Change default gofmt default settings for
parsing and printing to new syntax.
Use -oldparser to parse the old syntax,
use -oldprinter to print the old syntax.
2) Change default gofmt formatting settings
to use tabs for indentation only and to use
spaces for alignment. This will make the code
alignment insensitive to an editor's tabwidth.
Use -spaces=false to use tabs for alignment.
3) Manually changed src/exp/parser/parser_test.go
so that it doesn't try to parse the parser's
source files using the old syntax (they have
new syntax now).
4) gofmt -w src misc test/bench
5th and last set of files.
R=rsc
CC=golang-dev
http://codereview.appspot.com/180050
Diffstat (limited to 'src/pkg/syslog/syslog_test.go')
| -rw-r--r-- | src/pkg/syslog/syslog_test.go | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/pkg/syslog/syslog_test.go b/src/pkg/syslog/syslog_test.go index 7ecb289b5..a2801c502 100644 --- a/src/pkg/syslog/syslog_test.go +++ b/src/pkg/syslog/syslog_test.go @@ -4,91 +4,91 @@ package syslog import ( - "io"; - "log"; - "net"; - "testing"; + "io" + "log" + "net" + "testing" ) var serverAddr string func runSyslog(c net.PacketConn, done chan<- string) { - var buf [4096]byte; - var rcvd string = ""; + var buf [4096]byte + var rcvd string = "" for { - n, _, err := c.ReadFrom(&buf); + n, _, err := c.ReadFrom(&buf) if err != nil || n == 0 { break } - rcvd += string(buf[0:n]); + rcvd += string(buf[0:n]) } - done <- rcvd; + done <- rcvd } func startServer(done chan<- string) { - c, e := net.ListenPacket("udp", ":0"); + c, e := net.ListenPacket("udp", ":0") if e != nil { log.Exitf("net.ListenPacket failed udp :0 %v", e) } - serverAddr = c.LocalAddr().String(); - c.SetReadTimeout(10e6); // 10ms - go runSyslog(c, done); + serverAddr = c.LocalAddr().String() + c.SetReadTimeout(10e6) // 10ms + go runSyslog(c, done) } func TestNew(t *testing.T) { - s, err := New(LOG_INFO, ""); + s, err := New(LOG_INFO, "") if err != nil { t.Fatalf("New() failed: %s", err) } // Don't send any messages. - s.Close(); + s.Close() } func TestNewLogger(t *testing.T) { - f := NewLogger(LOG_INFO, 0); + f := NewLogger(LOG_INFO, 0) if f == nil { t.Errorf("NewLogger() failed\n") } } func TestDial(t *testing.T) { - l, err := Dial("", "", LOG_ERR, "syslog_test"); + l, err := Dial("", "", LOG_ERR, "syslog_test") if err != nil { t.Fatalf("Dial() failed: %s", err) } - l.Close(); + l.Close() } func TestUDPDial(t *testing.T) { - done := make(chan string); - startServer(done); - l, err := Dial("udp", serverAddr, LOG_INFO, "syslog_test"); + done := make(chan string) + startServer(done) + l, err := Dial("udp", serverAddr, LOG_INFO, "syslog_test") if err != nil { t.Fatalf("syslog.Dial() failed: %s", err) } - msg := "udp test"; - l.Info(msg); - expected := "<6>syslog_test: udp test\n"; - rcvd := <-done; + msg := "udp test" + l.Info(msg) + expected := "<6>syslog_test: udp test\n" + rcvd := <-done if rcvd != expected { t.Fatalf("s.Info() = '%q', but wanted '%q'", rcvd, expected) } } func TestWrite(t *testing.T) { - done := make(chan string); - startServer(done); - l, err := Dial("udp", serverAddr, LOG_ERR, "syslog_test"); + done := make(chan string) + startServer(done) + l, err := Dial("udp", serverAddr, LOG_ERR, "syslog_test") if err != nil { t.Fatalf("syslog.Dial() failed: %s", err) } - msg := "write test"; - _, err = io.WriteString(l, msg); + msg := "write test" + _, err = io.WriteString(l, msg) if err != nil { t.Fatalf("WriteString() failed: %s", err) } - expected := "<3>syslog_test: write test\n"; - rcvd := <-done; + expected := "<3>syslog_test: write test\n" + rcvd := <-done if rcvd != expected { t.Fatalf("s.Info() = '%q', but wanted '%q'", rcvd, expected) } |
