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

Fix failing tests in development-v6 branch #5542

Merged
merged 2 commits into from
Jan 10, 2024
Merged

Conversation

PromoFaux
Copy link
Member

What does this PR aim to accomplish?:

A change was introduced way back in June that presumably broke the tests. This got worked around by uploading the v6 binaries to the latest v5 release. No bueno.

The correct fix should have been to ensure that the devlopment-v6 branch of FTL is selected before trying to download it in tests (as we do with other tests).

We must ensure these tests get changed when development-v6 becomes development


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

  • I have read the above and my PR is ready for review. Check this box to confirm

…wnloaded for the tests. We need to change this to `develoment` once v6 is released

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@yubiuser
Copy link
Member

yubiuser commented Jan 7, 2024

Should we test for all architectures we have FTL builds for?

@PromoFaux
Copy link
Member Author

PromoFaux commented Jan 7, 2024

We probably should. Just FP'd over the last commit, in which I have reduced some code duplication for each arch's test.

Easier to maintain, and less places to remember to change development-v6 ->development in future

Edit: one more FP to change development-v6 to a declared FTL_BRANCH at the top of the file (which is then used in below tests where needed)

@PromoFaux PromoFaux force-pushed the v6/fix-tests branch 4 times, most recently from 040e568 to de53f02 Compare January 7, 2024 22:14
test/test_any_automated_install.py Outdated Show resolved Hide resolved
Use parametrize to run the same test with different parameters for each arch we need to test.
Also include detection of unusupported in this test.
Create FTL_BRANCH constant to be used in functions (less places to remember to change it)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
yubiuser
yubiuser previously approved these changes Jan 8, 2024
@yubiuser
Copy link
Member

yubiuser commented Jan 8, 2024

Wait, we don't check for i386.

And do we really need a check for both arm7l and arm7?

@yubiuser yubiuser requested a review from DL6ER January 8, 2024 20:02
@PromoFaux
Copy link
Member Author

Wait, we don't check for i386.

And do we really need a check for both arm7l and arm7?

i386 not as straightforward to test (see the code in the basic install that handles it)

I did look at adding a mock for the dpkg command earlier (uname is still x86_64) , but it didn't work. I can try again if it is important.

Really, aside from adding risc, I just used the same arch's that were already in the test. Can only assume i386 was left out on purpose before, too.

@yubiuser
Copy link
Member

yubiuser commented Jan 8, 2024

Maybe it's not important :)

@PromoFaux
Copy link
Member Author

I have FP'd away the previous commit that added the i386 tests. On closer inspection, the only OS we support that even has a 386 flavour is debian, and even then - I doubt all that many people are using it. It is likely why the test was left out initially. Adding it to the new tests causes the Fedora/Centos tests to fail - we could code around that with some exceptions, but it's a lot of completixty for what probably is not a lot of gain

@PromoFaux PromoFaux merged commit b756262 into development-v6 Jan 10, 2024
29 checks passed
@PromoFaux PromoFaux deleted the v6/fix-tests branch January 10, 2024 11:14
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.

None yet

3 participants