Jelajahi Sumber

Merge pull request #990 from dotcloud/fix-tests-cgo

* Hack: remove dependency of unit tests on 'os/user', which cannot be used with CGO_ENABLED=0
Solomon Hykes 12 tahun lalu
induk
melakukan
145c622aba
1 mengubah file dengan 3 tambahan dan 5 penghapusan
  1. 3 5
      runtime_test.go

+ 3 - 5
runtime_test.go

@@ -8,10 +8,10 @@ import (
 	"log"
 	"net"
 	"os"
-	"os/user"
 	"strconv"
 	"strings"
 	"sync"
+	"syscall"
 	"testing"
 	"time"
 )
@@ -49,10 +49,8 @@ func init() {
 		return
 	}
 
-	if usr, err := user.Current(); err != nil {
-		panic(err)
-	} else if usr.Uid != "0" {
-		panic("docker tests needs to be run as root")
+	if uid := syscall.Geteuid(); uid != 0 {
+		log.Fatal("docker tests needs to be run as root")
 	}
 
 	NetworkBridgeIface = "testdockbr0"