Skip to content

Remove TestEventsLimit(), and minor cleanups#35844

Merged
vdemeester merged 3 commits intomoby:masterfrom
thaJeztah:remove-test-events-limit
Dec 22, 2017
Merged

Remove TestEventsLimit(), and minor cleanups#35844
vdemeester merged 3 commits intomoby:masterfrom
thaJeztah:remove-test-events-limit

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Dec 20, 2017

This test was added a long time ago, and over the years has proven to be flaky (#28873, #22601, #25533, #21473, #13498), and slow (using 30 containers, and taking over a minute to run (#12675)).

To address those issues, it was modified to;

The last change to this test (made in ddae20c#diff-9e07f7c1f4d16eb428d628f85ee1a6f1R125) actually broke the test, as it's now testing that all events sent by containers (numContainers*eventPerContainer) are received, but the number of events that is generated (17 containers * 7 events = 119) is less than the limit (256 events).

The limit is already covered by the TestLogEvents unit-test that was added in #7452, and tests that the number of events is limited to eventsLimit.

This patch removes the test, because it's not needed.

Two other changes were added;

  • A small GoDoc change to document the correct limit
  • A small update to the unit-test to not use deprecated fields

This test was added a long time ago, and over the years has proven to be flaky,
and slow. To address those issues, it was modified to;

- cleanup containers afterwards
- take clock-skew into account
- improve performance by parallelizing the container runs
- _reduce_ parallelization to address platform issues on Windows (twice..)
- adjust the test to take new limits into account
- adjust the test to account for more events being generated by containers

The last change to this test (made in ddae20c) actually
broke the test, as it's now testing that all events sent by containers
(`numContainers*eventPerContainer`) are received, but the number of events that
is generated (17 containers * 7 events = 119) is less than the limit (256 events).

The limit is already covered by the `TestLogEvents` unit-test, that was added in
8d05642, and tests that the number of events
is limited to `eventsLimit`.

This patch removes the test, because it's not needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Commit 59d45c3 changed
the `eventsLimit` from 64 to 256, but did not update
the GoDoc accordingly.

This patch updates the GoDoc for `Subscribe` and `SubscribeTopic`
to match the actual limit.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The `Status` field was deprecated in favor of `Action`.

This patch updates the test to use the `Action` field,
but adds a check that both are set to the same value.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Dec 20, 2017

Wow, what's this error https://jenkins.dockerproject.org/job/Docker-PRs-powerpc/7619/console?

12:06:18 Step 1/31 : FROM ppc64le/debian:stretch
12:06:18 Get https://registry-1.docker.io/v2/ppc64le/debian/manifests/stretch: EOF
12:06:18 Unable to find image 'docker-powerpc:d887622' locally
12:06:19 docker: Error response from daemon: repository docker-powerpc not found: does not exist or no pull access.

This is a bit odd; where's the reference docker-powerpc coming from?

Unable to find image 'docker-powerpc:d887622' locally

@thaJeztah
Copy link
Copy Markdown
Member Author

ping @estesp @tianon - you are more familiar with manifests; perhaps you know what's with that error 😅

Copy link
Copy Markdown
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐮

thaJeztah referenced this pull request Dec 20, 2017
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Copy link
Copy Markdown
Member

@dnephin dnephin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants