Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add integration tests that excercise Thanos Receive edge cases #4362

Merged
merged 6 commits into from
Jul 2, 2021
Merged

Add integration tests that excercise Thanos Receive edge cases #4362

merged 6 commits into from
Jul 2, 2021

Conversation

bill3tt
Copy link
Contributor

@bill3tt bill3tt commented Jun 22, 2021 •
edited

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

This PR adds 3 new integration test scenarios for Thanos Receive.

router_replication and router_tree both currently fail against main.

See #4359 for discussion.

Verification

Tests are failing 🙃

@bill3tt
Adds 2 new integration tests, adds diagrams to integration test comme…
c7bd119 
…nts, adds IngestingReceiver testing type

Signed-off-by: Ian Billett <ibillett@redhat.com>
@GiedriusS
Copy link
Member

Thanks for this! I am thinking that maybe let's convert testutil.Ok to testutil.NotOk, merge, and then fix this in a follow-up PR?

@bill3tt bill3tt mentioned this pull request Jun 23, 2021
Closed
@bill3tt
add NotEquals testutil & assert that tests are failing
d80fe1e 
Signed-off-by: Ian Billett <ibillett@redhat.com>
@bill3tt
format
c12b30a 
Signed-off-by: Ian Billett <ibillett@redhat.com>
@bill3tt bill3tt marked this pull request as ready for review June 23, 2021 17:58
@bill3tt
Copy link
Contributor Author

bill3tt commented Jun 23, 2021

Nice idea @GiedriusS 👍

I've updated the integration tests to fail on the 'correct' value. PTAL.

@bill3tt bill3tt mentioned this pull request Jun 23, 2021
Merged
2 tasks
@bwplotka
Copy link
Member

Add failing test title sounds... scary ;p

bwplotka
bwplotka requested changes Jun 24, 2021
View reviewed changes
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

Nice tests, thanks for those,

But I would not add new helper, see comment 🙈

test/e2e/receive_test.go Outdated Show resolved Hide resolved
test/e2e/receive_test.go Outdated Show resolved Hide resolved
pkg/testutil/testutil.go Outdated Show resolved Hide resolved
@bill3tt
fix ascii diagrams
9220dd3 
Signed-off-by: Ian Billett <ibillett@redhat.com>
@bill3tt
remove testutils.NotEqual and revert to asserting the incorrect integ…
39df7c0 
…ration test value

Signed-off-by: Ian Billett <ibillett@redhat.com>
@bill3tt
bug
a745c8b 
Signed-off-by: Ian Billett <ibillett@redhat.com>
@bill3tt bill3tt changed the title Add failing Thanos Receive integration tests Add integration tests that excercise Thanos Receive edge cases Jun 28, 2021
@bill3tt bill3tt mentioned this pull request Jul 1, 2021
Merged
2 tasks
bwplotka
bwplotka approved these changes Jul 2, 2021
View reviewed changes
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

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

I love it, thanks!

Sorry for the massive lag on checking those!

@bwplotka bwplotka merged commit 7fbd7f5 into thanos-io:main Jul 2, 2021
@bill3tt bill3tt deleted the add-failing-receive-integration-tests branch July 2, 2021 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bwplotka bwplotka bwplotka approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bill3tt @GiedriusS @bwplotka