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

(RHEL-30372) ukify: make the test happy with the latest OpenSSL #264

Merged
merged 2 commits into from
Apr 26, 2024

Conversation

mrc0mmand
Copy link
Member

@mrc0mmand mrc0mmand commented Apr 24, 2024

Which dropped some whitespaces in the output:

$ openssl version
OpenSSL 3.2.0 23 Nov 2023 (Library: OpenSSL 3.2.0 23 Nov 2023)
$ openssl x509 -in cert.pem -text -noout | grep Issuer
        Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd

$ openssl version
OpenSSL 3.0.9 30 May 2023 (Library: OpenSSL 3.0.9 30 May 2023)
$ openssl x509 -in cert.pem -text -noout | grep Issuer
        Issuer: C = XX, L = Default City, O = Default Company Ltd

Making test-ukify unhappy:

>       assert 'Issuer: CN = SecureBoot signing key on host' in out
E       AssertionError: assert 'Issuer: CN = SecureBoot signing key on host' in '<...snip...>Issuer: CN=SecureBoot signing key on host archlinux2\n...'

(cherry picked from commit 338ed5b)

Related: RHEL-30372

Which dropped some whitespaces in the output:

$ openssl version
OpenSSL 3.2.0 23 Nov 2023 (Library: OpenSSL 3.2.0 23 Nov 2023)
$ openssl x509 -in cert.pem -text -noout | grep Issuer
        Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd

$ openssl version
OpenSSL 3.0.9 30 May 2023 (Library: OpenSSL 3.0.9 30 May 2023)
$ openssl x509 -in cert.pem -text -noout | grep Issuer
        Issuer: C = XX, L = Default City, O = Default Company Ltd

Making test-ukify unhappy:

>       assert 'Issuer: CN = SecureBoot signing key on host' in out
E       AssertionError: assert 'Issuer: CN = SecureBoot signing key on host' in '<...snip...>Issuer: CN=SecureBoot signing key on host archlinux2\n...'

(cherry picked from commit 338ed5b)

Related: RHEL-30372
To get rid of the "invalid escape sequence" warning:

=============================== warnings summary ===============================
../src/ukify/test/test_ukify.py:876
  ../src/ukify/test/test_ukify.py:876: SyntaxWarning: invalid escape sequence '\s'
    assert re.search('Issuer: CN\s?=\s?SecureBoot signing key on host', out)

(cherry picked from commit a0485e0)

Related: RHEL-30372
@github-actions github-actions bot changed the title ukify: make the test happy with the latest OpenSSL (RHEL-30372) ukify: make the test happy with the latest OpenSSL Apr 24, 2024
@github-actions github-actions bot added pr/needs-ci Formerly needs-ci pr/needs-review Formerly needs-review labels Apr 24, 2024
Copy link

github-actions bot commented Apr 24, 2024

Commit validation

Tracker - RHEL-30372

The following commits meet all requirements

commit upstream
027c8fc - ukify: make the test happy with the latest OpenSSL systemd/systemd@338ed5b
b07785e - test_ukify: use raw string for the regex systemd/systemd@a0485e0

Tracker validation

Success

🟢 Tracker RHEL-30372 has set desired product: CentOS Stream 9
🟢 Tracker RHEL-30372 has set desired component: systemd
🟢 Tracker RHEL-30372 has been approved


Pull Request validation

Success

🟡 CI - Waived
🟢 Review - Reviewed by a member
🟢 Approval - Changes were approved


Auto Merge

Success

🟢 Pull Request is not marked as draft and it's not blocked by dont-merge label
🟢 Pull Request meet requirements, title has correct form
🟢 Pull Request meet requirements, mergeable is true
🟠 Pull Request meet requirements, mergeable_state is unstable
🟢 Pull Request has correct target branch main
🟢 Pull Request was merged

Copy link
Member

@dtardon dtardon left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions github-actions bot removed the pr/needs-review Formerly needs-review label Apr 26, 2024
@mrc0mmand
Copy link
Member Author

(CI fail is unrelated, #260 should fix that)

@github-actions github-actions bot removed the pr/needs-ci Formerly needs-ci label Apr 26, 2024
@github-actions github-actions bot merged commit 1c4640a into redhat-plumbers:main Apr 26, 2024
28 of 29 checks passed
@mrc0mmand mrc0mmand deleted the fix-test-ukify branch April 26, 2024 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants