summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-merge-robot <k8s.production.user@gmail.com>2016-04-01 23:17:37 -0700
committerk8s-merge-robot <k8s.production.user@gmail.com>2016-04-01 23:17:37 -0700
commit69a34def5cb6ef6e3403878df65fe27fbef6645e (patch)
tree1cc6c9bdc70793ad5e10294a7a2d832b29371c0a
parent69a55133495e929ff894337dc3884889ca15bb0f (diff)
parent9a8e0fbebeb128ec4a73f6fca8e6c57fd20174a7 (diff)
Merge pull request #23766 from mikebrow/docs-minor-edit-testing-guide
Automatic merge from submit-queue minor edits to testing guide Noted a few small issues going through the getting started testing guide. Cheers, Mike Signed-off-by: mikebrow <brownwm@us.ibm.com>
-rw-r--r--testing.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/testing.md b/testing.md
index 3bc1c141..dc6a8bd7 100644
--- a/testing.md
+++ b/testing.md
@@ -32,11 +32,11 @@ Documentation for other releases can be found at
This assumes you already read the [development guide](development.md) to
install go, godeps, and configure your git client.
-In order to send pull requests you need to make sure you changes pass
-unit and integration tests.
+Before sending pull requests you should at least make sure your changes have
+passed both unit and integration tests.
-Kubernetes only merges pull requests when e2e tests are passing, so it is often
-a good idea to make sure these work as well.
+Kubernetes only merges pull requests when unit, integration, and e2e tests are
+passing, so it is often a good idea to make sure the e2e tests work as well.
## Unit tests
@@ -155,13 +155,13 @@ Kubernetes includes a script to help install etcd on your machine.
# Option a) install inside kubernetes root
cd kubernetes
hack/install-etcd.sh # Installs in ./third_party/etcd
-echo export PATH="$PATH:$(pwd)/third_party/etcd" >> .profile # Add to PATH
+echo export PATH="$PATH:$(pwd)/third_party/etcd" >> ~/.profile # Add to PATH
# Option b) install manually
cd kubernetes
grep -E "image.*etcd" cluster/saltbase/etcd/etcd.manifest # Find version
# Install that version using yum/apt-get/etc
-echo export PATH="$PATH:<LOCATION>" >> .profile # Add to PATH
+echo export PATH="$PATH:<LOCATION>" >> ~/.profile # Add to PATH
```
### Run integration tests