|
...
|
...
|
@@ -188,7 +188,7 @@ working against the API. Run it with:
|
|
188
|
188
|
$ hack/test-cmd.sh
|
|
189
|
189
|
|
|
190
|
190
|
This suite comprises many smaller suites, which are found under `test/cmd` and
|
|
191
|
|
-can be run individually by specifying a regex filter, passed through `grep -E`
|
|
|
191
|
+can be run individually by specifying a regex filter, passed through `grep -E`
|
|
192
|
192
|
like with integration tests above:
|
|
193
|
193
|
|
|
194
|
194
|
$ hack/test-cmd.sh <regex>
|
|
...
|
...
|
@@ -221,7 +221,7 @@ components working together.
|
|
221
|
221
|
|
|
222
|
222
|
The end-to-end suite is currently implemented primarily in Bash, but will be
|
|
223
|
223
|
folded into the extended suite (located in test/extended) over time.
|
|
224
|
|
-The extended suite is closer to the upstream Kubernetes e2e suite and
|
|
|
224
|
+The extended suite is closer to the upstream Kubernetes e2e suite and
|
|
225
|
225
|
tests the full behavior of a running system.
|
|
226
|
226
|
|
|
227
|
227
|
Run the end to end tests with:
|
|
...
|
...
|
@@ -242,8 +242,7 @@ the Ginkgo library. They must be able to be run remotely, and cannot depend on
|
|
242
|
242
|
any local interaction with the filesystem or Docker.
|
|
243
|
243
|
|
|
244
|
244
|
More information about running extended tests can be found in
|
|
245
|
|
-[test/extended/README](https://github.com/openshift/origin/blob/master/test/exte
|
|
246
|
|
-nded/README.md).
|
|
|
245
|
+[test/extended/README](https://github.com/openshift/origin/blob/master/test/extended/README.md).
|
|
247
|
246
|
|
|
248
|
247
|
|
|
249
|
248
|
## Installing Godep
|
|
...
|
...
|
@@ -288,7 +287,7 @@ If this fails, then it's possible you may need to pick multiple commits.
|
|
288
|
288
|
the next rebase?
|
|
289
|
289
|
|
|
290
|
290
|
Assuming you read the bullets above... If your patch is really far behind, for
|
|
291
|
|
-example, if there have been 5 commits modifying the directory you care about,
|
|
|
291
|
+example, if there have been 5 commits modifying the directory you care about,
|
|
292
|
292
|
cherry picking will be increasingly difficult and you should consider waiting
|
|
293
|
293
|
for the next rebase, which will likely include the commit you care about, or at
|
|
294
|
294
|
least decrease the amount of cherry picks you need to do to merge.
|
|
...
|
...
|
@@ -322,7 +321,7 @@ automated manner.
|
|
322
|
322
|
|
|
323
|
323
|
To use this command, be sure to setup remote Pull Request branches in the
|
|
324
|
324
|
kubernetes repository you are using (i.e. like https://gist.github.com/piscisaureus/3342247).
|
|
325
|
|
-Specifically, you will be doing this, to the git config you probably already
|
|
|
325
|
+Specifically, you will be doing this, to the git config you probably already
|
|
326
|
326
|
have for kubernetes:
|
|
327
|
327
|
|
|
328
|
328
|
```
|