Skip to content

Commit

Permalink
minor edits to testing guide
Browse files Browse the repository at this point in the history
Signed-off-by: mikebrow <brownwm@us.ibm.com>
  • Loading branch information
mikebrow committed Apr 1, 2016
1 parent bf07a6f commit 23fddb3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions docs/devel/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

1 comment on commit 23fddb3

@k8s-teamcity-mesosphere

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity OSS :: Kubernetes Mesos :: 4 - Smoke Tests Build 20414 outcome was SUCCESS
Summary: Tests passed: 1, ignored: 267 Build time: 00:05:42

Please sign in to comment.