From 76a37694f66cd75fef28f5a5b11d3ced0b455a25 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Thu, 24 Sep 2015 10:49:43 -0700 Subject: [PATCH] Revert "Temporary workaround of problem with not ready endpoints." This reverts commit eb9cb8fbae6a30cae8af87545f208360c6e76f07. --- test/e2e/autoscaling.go | 4 ++-- test/e2e/autoscaling_utils.go | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/e2e/autoscaling.go b/test/e2e/autoscaling.go index 56bb1fca0e5..f6d54c0bb45 100644 --- a/test/e2e/autoscaling.go +++ b/test/e2e/autoscaling.go @@ -57,7 +57,7 @@ var _ = Describe("Autoscaling", func() { // Consume 60% CPU millicoresPerReplica := 600 - rc := NewStaticResourceConsumer("cpu-utilization", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f) + rc := NewStaticResourceConsumer("rc", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f) expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute)) rc.CleanUp() @@ -79,7 +79,7 @@ var _ = Describe("Autoscaling", func() { // Consume 60% of total memory capacity megabytesPerReplica := int(memCapacityMb * 6 / 10 / coresPerNode) - rc := NewStaticResourceConsumer("mem-utilization", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f) + rc := NewStaticResourceConsumer("rc", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f) expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute)) rc.CleanUp() diff --git a/test/e2e/autoscaling_utils.go b/test/e2e/autoscaling_utils.go index 389b6352f72..9a05d104097 100644 --- a/test/e2e/autoscaling_utils.go +++ b/test/e2e/autoscaling_utils.go @@ -262,6 +262,4 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli MemLimit: memLimitMb * 1024 * 1024, // MemLimit is in bytes } expectNoError(RunRC(config)) - // Wait until endpoints are processed. Temporary workaround until #14477 is fixed. - time.Sleep(10 * time.Second) }