summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Hockin <thockin@google.com>2016-04-13 23:30:15 -0700
committerTim Hockin <thockin@google.com>2016-05-08 20:30:37 -0700
commitf02a0dc5c12a0c24586bfd6d73820ee1a4551eaa (patch)
tree3489e578e8e73e0a21c823eb9d882141601999f1
parent1f7e8a462bccdcc4219d41d4ed94d024c66486b5 (diff)
Convert everything to use vendor/
-rw-r--r--development.md2
-rw-r--r--e2e-node-tests.md4
-rw-r--r--flaky-tests.md2
-rw-r--r--testing.md6
4 files changed, 7 insertions, 7 deletions
diff --git a/development.md b/development.md
index 415bb490..d08dc3d2 100644
--- a/development.md
+++ b/development.md
@@ -193,7 +193,7 @@ godep v53 (linux/amd64/go1.5.3)
### Using godep
-Here's a quick walkthrough of one way to use godeps to add or update a Kubernetes dependency into Godeps/\_workspace. For more details, please see the instructions in [godep's documentation](https://github.com/tools/godep).
+Here's a quick walkthrough of one way to use godeps to add or update a Kubernetes dependency into `vendor/`. For more details, please see the instructions in [godep's documentation](https://github.com/tools/godep).
1) Devote a directory to this endeavor:
diff --git a/e2e-node-tests.md b/e2e-node-tests.md
index 09189457..98450796 100644
--- a/e2e-node-tests.md
+++ b/e2e-node-tests.md
@@ -82,12 +82,12 @@ See [setup_host.sh](../../test/e2e_node/environment/setup_host.sh)
* **Requires password-less ssh and sudo access**
* Make sure this works - e.g. `ssh <hostname> -- sudo echo "ok"`
* If ssh flags are required (e.g. `-i`), they can be used and passed to the tests with `--ssh-options`
- * `godep go run test/e2e_node/runner/run_e2e.go --logtostderr --hosts <comma separated hosts>`
+ * `go run test/e2e_node/runner/run_e2e.go --logtostderr --hosts <comma separated hosts>`
* **Must be run from kubernetes root**
* requires (go get): `github.com/tools/godep`, `github.com/onsi/gomega`, `github.com/onsi/ginkgo/ginkgo`
3. Alternatively, manually build and copy `e2e_node_test.tar.gz` to a remote host
- * Build the tar.gz `godep go run test/e2e_node/runner/run_e2e.go --logtostderr --build-only`
+ * Build the tar.gz `go run test/e2e_node/runner/run_e2e.go --logtostderr --build-only`
* requires (go get): `github.com/tools/godep`, `github.com/onsi/gomega`, `github.com/onsi/ginkgo/ginkgo`
* Copy `e2e_node_test.tar.gz` to the remote host
* Extract the archive on the remote host `tar -xzvf e2e_node_test.tar.gz`
diff --git a/flaky-tests.md b/flaky-tests.md
index cd27c200..e757021f 100644
--- a/flaky-tests.md
+++ b/flaky-tests.md
@@ -107,7 +107,7 @@ $ go install golang.org/x/tools/cmd/stress
Then build your test binary
```
-$ godep go test -c -race
+$ go test -c -race
```
Then run it under stress
diff --git a/testing.md b/testing.md
index e415e442..72f1c328 100644
--- a/testing.md
+++ b/testing.md
@@ -84,10 +84,10 @@ hack/test-go.sh # Run all unit tests.
cd kubernetes
# Run all tests under pkg (requires client to be in $GOPATH/src/k8s.io)
-godep go test ./pkg/...
+go test ./pkg/...
# Run all tests in the pkg/api (but not subpackages)
-godep go test ./pkg/api
+go test ./pkg/api
```
### Stress running unit tests
@@ -135,7 +135,7 @@ To run benchmark tests, you'll typically use something like:
```sh
cd kubernetes
-godep go test ./pkg/apiserver -benchmem -run=XXX -bench=BenchmarkWatch
+go test ./pkg/apiserver -benchmem -run=XXX -bench=BenchmarkWatch
```
This will do the following: