From cc6590d362b168486595f9bafab1ad2dbc5609fc Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Mon, 17 Sep 2018 16:27:41 +0200 Subject: [PATCH] Revert "enable sockopt tests" This reverts commit 2f28d380b39b139319dab8a12e4ac89d2dbd1b51. --- .travis.yml | 1 - shippable.yml | 1 - transport/internet/sockopt_linux_test.go | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9682077b0..0f316b142 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ before_script: - uname -a - sudo ntpdate -u time.google.com - date -- sudo setcap cap_net_admin=eip ${GOROOT}/bin/go script: - go test -p 1 -tags json -v v2ray.com/core/... after_success: diff --git a/shippable.yml b/shippable.yml index 5962c4942..841dd0a1a 100644 --- a/shippable.yml +++ b/shippable.yml @@ -15,7 +15,6 @@ build: - tar -C /usr/local -xzf golang.tar.gz - export PATH=$PATH:/usr/local/go/bin - export GOPATH=/v2ray - - sudo setcap cap_net_admin=eip /usr/loca/go/bin/go - go get v2ray.com/core/... - go get v2ray.com/ext/... - go test -p 1 -v v2ray.com/core/... diff --git a/transport/internet/sockopt_linux_test.go b/transport/internet/sockopt_linux_test.go index 9bf084334..1d2cfc4ce 100644 --- a/transport/internet/sockopt_linux_test.go +++ b/transport/internet/sockopt_linux_test.go @@ -12,6 +12,8 @@ import ( ) func TestSockOptMark(t *testing.T) { + t.Skip("requires CAP_NET_ADMIN") + tcpServer := tcp.Server{ MsgProcessor: func(b []byte) []byte { return b