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.

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

Updog: use compile time specific json payloads in unit tests #2367

Merged
merged 1 commit into from
Aug 23, 2022

Conversation

jpmcb
Copy link
Contributor

@jpmcb jpmcb commented Aug 23, 2022

Issue number:

Closes #2366

Description of changes:

Modifies the updog unit tests to use architecture specific json stub
files when those tests make assertions based on the host architecture.

This patch fixes unit tests not working on aarch machines due to hard
coded "x86_64" string literals.

Signed-off-by: John McBride <jpmmcb@amazon.com>

Adds a few files for aarch64 based machines and modifies the names of previous files to be have the new naming convention.

Testing done:

Now able to fully run cargo make unit-tests with no errors

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Copy link
Contributor

@etungsten etungsten left a comment

Choose a reason for hiding this comment

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

🐕

sources/updater/updog/src/main.rs Outdated Show resolved Hide resolved
Modifies the updog unit tests to use architecture specific json stub
files when those tests make assertions based on the host architecture.

This patch fixes unit tests not working on aarch machines due to hard
coded "x86_64" string literals.

Signed-off-by: John McBride <jpmmcb@amazon.com>
@jpmcb
Copy link
Contributor Author

jpmcb commented Aug 23, 2022

Force pushed to update %s/Updog/updog/ in comment and commit message

Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🧑‍🎤

@jpmcb jpmcb merged commit 037d0e2 into bottlerocket-os:develop Aug 23, 2022
@jpmcb jpmcb deleted the updog-aarch-unit-tests branch August 23, 2022 16:07
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.

Updog unit tests broken on aarch - have hard coded x86_64 values
3 participants