diff --git a/coding-conventions.md b/coding-conventions.md index c3f7d628f..dc2825b0c 100644 --- a/coding-conventions.md +++ b/coding-conventions.md @@ -109,7 +109,7 @@ following Go conventions - `stateLock`, `mapLock` etc. tests - Table-driven tests are preferred for testing multiple scenarios/inputs; for -example, see [TestNamespaceAuthorization](../../test/integration/auth_test.go) +example, see [TestNamespaceAuthorization](../../test/integration/auth/auth_test.go) - Significant features should come with integration (test/integration) and/or [end-to-end (test/e2e) tests](e2e-tests.md) diff --git a/testing.md b/testing.md index 4ae988595..4e41a1da3 100644 --- a/testing.md +++ b/testing.md @@ -73,7 +73,7 @@ passing, so it is often a good idea to make sure the e2e tests work as well. * All packages and any significant files require unit tests. * The preferred method of testing multiple scenarios or input is [table driven testing](https://github.com/golang/go/wiki/TableDrivenTests) - - Example: [TestNamespaceAuthorization](../../test/integration/auth_test.go) + - Example: [TestNamespaceAuthorization](../../test/integration/auth/auth_test.go) * Unit tests must pass on OS X and Windows platforms. - Tests using linux-specific features must be skipped or compiled out. - Skipped is better, compiled out is required when it won't compile. @@ -189,9 +189,9 @@ See `go help test` and `go help testflag` for additional info. - This includes kubectl commands * The preferred method of testing multiple scenarios or inputs is [table driven testing](https://github.com/golang/go/wiki/TableDrivenTests) - - Example: [TestNamespaceAuthorization](../../test/integration/auth_test.go) + - Example: [TestNamespaceAuthorization](../../test/integration/auth/auth_test.go) * Each test should create its own master, httpserver and config. - - Example: [TestPodUpdateActiveDeadlineSeconds](../../test/integration/pods_test.go) + - Example: [TestPodUpdateActiveDeadlineSeconds](../../test/integration/pods/pods_test.go) * See [coding conventions](coding-conventions.md). ### Install etcd dependency