integration / integration-cil: cleanup and fix API versions used in tests #46891
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sion TestKillDifferentUserContainer was migrated from integration-cli in commit 0855922. Before migration, it was not using a specific API version, so we can assume "current" API version. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…version Use the minimum API version as advertised by the test-daemon, instead of the hard-coded API version from code. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This removes various skips that accounted for running the integration tests against older versions of the daemon before 20.10 (API version v1.41). Those versions are EOL, and we don't run tests against them. This reverts most of e440831, and similar PRs. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
commented
Dec 5, 2023
Comment on lines
-1490
to
+1451
| if versions.LessThan(testEnv.DaemonAPIVersion(), "1.31") { | ||
| assert.Equal(c, *containerJSON.HostConfig.MemorySwappiness, int64(-1)) | ||
| } else { | ||
| assert.Assert(c, containerJSON.HostConfig.MemorySwappiness == nil) | ||
| } | ||
| assert.Assert(c, containerJSON.HostConfig.MemorySwappiness == nil) |
There was a problem hiding this comment.
For reviewers; these conditions were changing the test based on version of the daemon (testEnv.DaemonAPIVersion() is the fixed API version supported by the daemon), and adjusting the test for bugs in older versions of the daemon (not so much "chances between API versions")
They were in place to allow running the integration tests against older versions of the daemon
vvoland
approved these changes
Dec 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
integration/container: TestKillDifferentUserContainer: adjust API version
TestKillDifferentUserContainer was migrated from integration-cli in
commit 0855922. Before migration, it
was not using a specific API version, so we can assume "current"
API version.
integration/container: TestInfoAPIVersioned: adjust API version
This test was using API version 1.20 to test old behavior, but the actual change
in behavior was API v1.25; see commit 6d98e34
and 63b5a37.
This updates the test to use API v1.24 to test the old behavior.
integration-cli: TestAPIClientVersionOldNotSupported: use daemon API version
Use the minimum API version as advertised by the test-daemon, instead of the
hard-coded API version from code.
integration(-cli): remove skips for old daemon versions (<20.10)
This removes various skips that accounted for running the integration tests
against older versions of the daemon before 20.10 (API version v1.41). Those
versions are EOL, and we don't run tests against them.
This reverts most of e440831, and similar
PRs.
- A picture of a cute animal (not mandatory but encouraged)