From 64c84cc90d79f9e06c5dac6ac9dc62d9dc6ebfec Mon Sep 17 00:00:00 2001 From: Tony Li Date: Thu, 16 Feb 2017 17:25:05 -0800 Subject: fix -- separators --- contributors/devel/e2e-tests.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributors/devel/e2e-tests.md b/contributors/devel/e2e-tests.md index 6f787673..91ec20dc 100644 --- a/contributors/devel/e2e-tests.md +++ b/contributors/devel/e2e-tests.md @@ -101,10 +101,10 @@ go run hack/e2e.go -- -v --test --test_args="--ginkgo.focus=\[Feature:Performanc go run hack/e2e.go -- -v --test --test_args="--ginkgo.skip=Pods.*env" # Run tests in parallel, skip any that must be run serially -GINKGO_PARALLEL=y go run hack/e2e.go --v --test --test_args="--ginkgo.skip=\[Serial\]" +GINKGO_PARALLEL=y go run hack/e2e.go -- -v --test --test_args="--ginkgo.skip=\[Serial\]" # Run tests in parallel, skip any that must be run serially and keep the test namespace if test failed -GINKGO_PARALLEL=y go run hack/e2e.go --v --test --test_args="--ginkgo.skip=\[Serial\] --delete-namespace-on-failure=false" +GINKGO_PARALLEL=y go run hack/e2e.go -- -v --test --test_args="--ginkgo.skip=\[Serial\] --delete-namespace-on-failure=false" # Flags can be combined, and their actions will take place in this order: # --build, --up, --test, --down -- cgit v1.2.3 From 5b1da0a8bd030964207a9277870a4764209352a2 Mon Sep 17 00:00:00 2001 From: Tony Li Date: Thu, 16 Feb 2017 17:33:32 -0800 Subject: change -up to --up --- contributors/devel/e2e-tests.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributors/devel/e2e-tests.md b/contributors/devel/e2e-tests.md index 91ec20dc..b5b05d78 100644 --- a/contributors/devel/e2e-tests.md +++ b/contributors/devel/e2e-tests.md @@ -315,7 +315,7 @@ $ go run hack/e2e.go -- -v --down #### Shortcuts for test developers -* To speed up `e2e.go -up`, provision a single-node kubernetes cluster in a single e2e zone: +* To speed up `--up`, provision a single-node kubernetes cluster in a single e2e zone: `NUM_NODES=1 E2E_ZONES="us-central1-f"` @@ -329,7 +329,7 @@ $ go run hack/e2e.go -- -v --down * If you're hacking around with the federation control plane deployment itself, you can quickly re-deploy the federation control plane Kubernetes manifests without tearing any resources down. - To re-deploy the federation control plane after running `-up` for the first time: + To re-deploy the federation control plane after running `--up` for the first time: ```sh $ federation/cluster/federation-up.sh -- cgit v1.2.3 From 91ca3b62ebc9f16a7f54df525f41b767cb78e71b Mon Sep 17 00:00:00 2001 From: Tony Li Date: Thu, 16 Feb 2017 17:33:47 -0800 Subject: reorganize doc for easier discovery --- contributors/devel/e2e-tests.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/contributors/devel/e2e-tests.md b/contributors/devel/e2e-tests.md index b5b05d78..2bdf9069 100644 --- a/contributors/devel/e2e-tests.md +++ b/contributors/devel/e2e-tests.md @@ -65,7 +65,7 @@ looking to execute or add tests using a local development environment. Before writing new tests or making substantive changes to existing tests, you should also read [Writing Good e2e Tests](writing-good-e2e-tests.md) -## Building and Running the Tests +## Building Kubernetes and Running the Tests There are a variety of ways to run e2e tests, but we aim to decrease the number of ways to run e2e tests to a canonical way: `hack/e2e.go`. @@ -136,6 +136,14 @@ with this command: go run hack/e2e.go -- -v --down ``` +## Building the Tests + +* You can quickly recompile the e2e testing framework via `go install ./test/e2e`. + This will not do anything besides allow you to verify that the go code compiles. + +* If you want to run your e2e testing framework without re-provisioning the e2e setup, + you can do so via `make WHAT=test/e2e/e2e.test` and then re-running the ginkgo tests. + ## Advanced testing ### Installing/updating kubetest @@ -321,12 +329,6 @@ $ go run hack/e2e.go -- -v --down Keep in mind that some tests may require multiple underlying clusters and/or minimum compute resource availability. -* You can quickly recompile the e2e testing framework via `go install ./test/e2e`. This will not do anything besides - allow you to verify that the go code compiles. - -* If you want to run your e2e testing framework without re-provisioning the e2e setup, you can do so via - `make WHAT=test/e2e/e2e.test` and then re-running the ginkgo tests. - * If you're hacking around with the federation control plane deployment itself, you can quickly re-deploy the federation control plane Kubernetes manifests without tearing any resources down. To re-deploy the federation control plane after running `--up` for the first time: -- cgit v1.2.3