Merge pull request #335 from xaionaro-facebook/master

Simplified porting from client4 to nclient4

.travis.yml

@@ -5,6 +5,7 @@ sudo: required
 go:
   - "1.11"
   - "1.12"
+  - "1.13"
   - tip
 
 env:

.travis/tests.sh

@@ -10,14 +10,23 @@ echo "" > coverage.txt
 # tests.
 ip a
 
+GO_TEST_OPTS=()
+if [[ "$TRAVIS_GO_VERSION" =~ ^1.(9|10|11|12)$ ]]
+then
+    # We use fmt.Errorf with verb "%w" which appeared only in Go1.13.
+    # So the code compiles and works with Go1.12, but error descriptions
+    # looks uglier and it does not pass "vet" tests on Go<1.13.
+    GO_TEST_OPTS+='-vet=off'
+fi
+
 for d in $(go list ./... | grep -v vendor); do
-    go test -race -coverprofile=profile.out -covermode=atomic $d
+    go test -race -coverprofile=profile.out -covermode=atomic ${GO_TEST_OPTS[@]} $d
     if [ -f profile.out ]; then
         cat profile.out >> coverage.txt
         rm profile.out
     fi
     # integration tests
-    go test -c -cover -tags=integration -race -covermode=atomic $d
+    go test -c -cover -tags=integration -race -covermode=atomic ${GO_TEST_OPTS[@]} $d
     testbin="./$(basename $d).test"
     # only run it if it was built - i.e. if there are integ tests
     test -x "${testbin}" && sudo "./${testbin}" -test.coverprofile=profile.out

dhcpv4/client4/client.go

@@ -1,3 +1,4 @@
+// Package client4 is deprecated. Use "nclient4" instead.
 package client4
 
 import (