github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21105 from caesarxuchao/watchCacheForIntegration

Browse Source 
turn on and off watch cache in integration test
This commit is contained in:
Mike Danese 2016-02-12 14:02:47 -08:00
commit 695211e2ee
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/integration/integration.go
View File

@ -77,6 +77,7 @@ var (
fakeDocker2 = dockertools.NewFakeDockerClient() fakeDocker2 = dockertools.NewFakeDockerClient()
// Limit the number of concurrent tests. // Limit the number of concurrent tests.
maxConcurrency int maxConcurrency int
watchCache bool
longTestTimeout = time.Second * 500 longTestTimeout = time.Second * 500
@ -169,6 +170,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
masterConfig.ReadWritePort = portNumber masterConfig.ReadWritePort = portNumber
masterConfig.PublicAddress = hostIP masterConfig.PublicAddress = hostIP
masterConfig.CacheTimeout = 2 * time.Second masterConfig.CacheTimeout = 2 * time.Second
masterConfig.EnableWatchCache = watchCache
// Create a master and install handlers into mux. // Create a master and install handlers into mux.
m, err := master.New(masterConfig) m, err := master.New(masterConfig)
@ -961,6 +963,8 @@ type testFunc func(*client.Client)
func addFlags(fs *pflag.FlagSet) { func addFlags(fs *pflag.FlagSet) {
fs.IntVar( fs.IntVar(
&maxConcurrency, "max-concurrency", -1, "Maximum number of tests to be run simultaneously. Unlimited if set to negative.") &maxConcurrency, "max-concurrency", -1, "Maximum number of tests to be run simultaneously. Unlimited if set to negative.")
fs.BoolVar(
&watchCache, "watch-cache", false, "Turn on watch cache on API server.")
} }
func main() { func main() {

10
hack/test-integration.sh
View File

@ -55,10 +55,14 @@ runTests() {
KUBE_API_VERSIONS="v1,extensions/v1beta1" \ KUBE_API_VERSIONS="v1,extensions/v1beta1" \
"${KUBE_ROOT}/hack/test-go.sh" test/integration "${KUBE_ROOT}/hack/test-go.sh" test/integration
kube::log::status "Running integration test scenario" kube::log::status "Running integration test scenario with watch cache on"
KUBE_API_VERSIONS="v1,extensions/v1beta1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \ KUBE_API_VERSIONS="v1,extensions/v1beta1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \
--max-concurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}" --max-concurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}" --watch-cache=true
kube::log::status "Running integration test scenario with watch cache off"
KUBE_API_VERSIONS="v1,extensions/v1beta1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \
--max-concurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}" --watch-cache=false
cleanup cleanup
} }