Skip to content
This repository has been archived by the owner on Jun 13, 2021. It is now read-only.

Remove poll-breaking assertion in e2e tests #784

Merged
merged 1 commit into from
Dec 13, 2019

Conversation

zappy-shu
Copy link
Contributor

@zappy-shu zappy-shu commented Dec 10, 2019

- What I did

Fixes #786

Removed assertion of local-in-docker command result when running e2e tests in swarm. This function is only used by the compatibility tests which does it's own assertion in a poll (

output = info.execCmd("/usr/bin/wget", "-O", "-", url)
). The removed assertion was breaking the poll flow stopping the test from being able to retry.

- How I did it

Removed result.Assert in the runLocalCmd which is used in the TestBackwardsCompatibilityV1 to check if the app's port has been updated. Note that TestBackwardsCompatibilityV1 is the only place that the runLocalCmd is used either through runner.localCmd or runner.execCmd.

- How to verify it

Run the TestBackwardsCompatibilityV1 e2e test:
make E2E_TESTS=TestBackwardsCompatibilityV1 -f docker.Makefile test-e2e

The CI will check if all e2e tests pass

- A picture of a cute animal (not mandatory)

kitten-2019-11-12

@codecov
Copy link

codecov bot commented Dec 11, 2019

Codecov Report

Merging #784 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #784   +/-   ##
=======================================
  Coverage   70.32%   70.32%           
=======================================
  Files          67       67           
  Lines        3740     3740           
=======================================
  Hits         2630     2630           
  Misses        762      762           
  Partials      348      348

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1cfb232...c58a172. Read the comment docs.

@zappy-shu zappy-shu changed the title [WIP] Testing removal of double assert in e2e Remove poll-breaking assertion in e2e tests Dec 12, 2019
Removed assertion of local-in-docker command result when running e2e tests in swarm.
This function is only used by the compatibility tests which does it's own assertion in a poll.
The removed assertion was breaking the poll flow stopping the test from being able to retry.

Signed-off-by: Nick Adcock <nick.adcock@docker.com>
Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

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

LGTM

@silvin-lubecki silvin-lubecki merged commit 31e76df into docker:master Dec 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TestBackwardsCompatibilityV1 e2e test is flakey
4 participants