Skip to content

Backport of Re-order expected/actual for assertContainerState in consul container tests into release/1.16.x#18158

Merged
hc-github-team-consul-core merged 1 commit into
release/1.16.xfrom
backport/fix-container-tests/uniquely-giving-gopher
Jul 17, 2023
Merged

Backport of Re-order expected/actual for assertContainerState in consul container tests into release/1.16.x#18158
hc-github-team-consul-core merged 1 commit into
release/1.16.xfrom
backport/fix-container-tests/uniquely-giving-gopher

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #18157 to be assessed for backporting due to the inclusion of the label backport/1.16.

The below text is copied from the body of the original PR.


Description

  • with changes introduced in: https://github.com/hashicorp/consul/pull/18130/files, make dev-docker still builds consul:local image whilst the integration tests locally are looking for hashicorp/consul:local. This PR fixes that
  • Little bonus: whilst working on integration tests I realized AssertContainerState gives the container statuses in reverse orders

Testing & Reproduction steps

  • CI tests
  • or locally: make dev-docker and run any integration test of your choice

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix-container-tests/uniquely-giving-gopher branch from fedb250 to 16c8f53 Compare July 17, 2023 18:11
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix-container-tests/uniquely-giving-gopher branch from 6669d0f to 1909c21 Compare July 17, 2023 18:11
@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) July 17, 2023 18:11
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@hc-github-team-consul-core hc-github-team-consul-core merged commit 73bd9e8 into release/1.16.x Jul 17, 2023
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/fix-container-tests/uniquely-giving-gopher branch July 17, 2023 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants