Imported Upstream version 2011.05.22

1 files changed, 17 insertions, 3 deletions

diff --git a/src/pkg/syslog/syslog_test.go b/src/pkg/syslog/syslog_test.go
index 4816ddf2a..5c0b3e0c4 100644
--- a/src/pkg/syslog/syslog_test.go
+++ b/src/pkg/syslog/syslog_test.go
@@ -35,7 +35,19 @@ func startServer(done chan<- string) {
 	go runSyslog(c, done)
 }
 
+func skipNetTest(t *testing.T) bool {
+	if testing.Short() {
+		// Depends on syslog daemon running, and sometimes it's not.
+		t.Logf("skipping syslog test during -short")
+		return true
+	}
+	return false
+}
+
 func TestNew(t *testing.T) {
+	if skipNetTest(t) {
+		return
+	}
 	s, err := New(LOG_INFO, "")
 	if err != nil {
 		t.Fatalf("New() failed: %s", err)
@@ -45,6 +57,9 @@ func TestNew(t *testing.T) {
 }
 
 func TestNewLogger(t *testing.T) {
+	if skipNetTest(t) {
+		return
+	}
 	f := NewLogger(LOG_INFO, 0)
 	if f == nil {
 		t.Error("NewLogger() failed")
@@ -52,9 +67,8 @@ func TestNewLogger(t *testing.T) {
 }
 
 func TestDial(t *testing.T) {
-	if testing.Short() {
-		// Depends on syslog daemon running, and sometimes it's not.
-		t.Logf("skipping syslog test during -short")
+	if skipNetTest(t) {
+		return
 	}
 	l, err := Dial("", "", LOG_ERR, "syslog_test")
 	if err != nil {