...
|
...
|
@@ -109,7 +109,7 @@ focus on ensuring that naturally related components work correctly. They should
|
109
|
109
|
testing branches or error conditions inside packages (that's what unit tests do), but they should
|
110
|
110
|
validate that important success and error paths work across layers (especially when errors are being
|
111
|
111
|
converted from lower level errors). Integration tests should not be testing details of the
|
112
|
|
-intercomponent connections - API tests should not test that the JSON serialized to the wire is
|
|
112
|
+inter-component connections - API tests should not test that the JSON serialized to the wire is
|
113
|
113
|
correctly converted back and forth (unit test responsibility), but they should test that those
|
114
|
114
|
connections have the expected outcomes. The underlying goal of integration tests is to wire together
|
115
|
115
|
the most important components in isolation. Integration tests should be as fast as possible in order
|
...
|
...
|
@@ -128,7 +128,7 @@ their own files so we can selectively build them.
|
128
|
128
|
All integration tests are located under `test/integration/*`. All integration tests must set the
|
129
|
129
|
`integration` build tag at the top of their source file, and also declare whether they need etcd
|
130
|
130
|
with the `etcd` build tag and whether they need Docker with the `docker` build tag. For
|
131
|
|
-special function sets please create subdirectories like `test/integration/deployimages`.
|
|
131
|
+special function sets please create sub directories like `test/integration/deployimages`.
|
132
|
132
|
|
133
|
133
|
Run the integration tests with:
|
134
|
134
|
|
...
|
...
|
@@ -182,7 +182,7 @@ You can use `hack/cherry-pick.sh` to generate patches for Origin from upstream c
|
182
|
182
|
this command, be sure to setup remote branches like https://gist.github.com/piscisaureus/3342247
|
183
|
183
|
so that `git show origin/pr/<number>` displays information about your branch after a `git fetch`.
|
184
|
184
|
You must also have the Kubernetes repository checked out in your GOPATH (visible as `../../../k8s.io/kubernetes`)
|
185
|
|
-and have no modified or uncommited files in either repository.
|
|
185
|
+and have no modified or uncommitted files in either repository.
|
186
|
186
|
|
187
|
187
|
To pull an upstream commit, run:
|
188
|
188
|
|