Skip to content

fix: tpm integration test to use new response format #44

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

Merged
Perfect5th merged 1 commit into from
Apr 9, 2026
Merged

fix: tpm integration test to use new response format #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ on:
jobs:
snapd_integration_test:
uses: ./.github/workflows/integration-test.yml
tpm_integration_test:
uses: ./.github/workflows/integration-tpm.yml
1 change: 1 addition & 0 deletions .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Integration Test

on:
workflow_call:
workflow_dispatch:

jobs:
snapd_integration_test:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/integration-tpm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: Integration Test with TPM and FDE

on:
schedule:
- cron: '0 0 * * 0'
workflow_call:
workflow_dispatch:

jobs:
Expand Down
6 changes: 3 additions & 3 deletions tests/integration_tpm/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def test_add_recovery_key():
generate_result = snap_http.generate_recovery_key().result
key_id = generate_result["key-id"]

response = wait_for(snap_http.update_recovery_key)(key_id, "test-add-key", False)
response, _ = wait_for(snap_http.update_recovery_key)(key_id, "test-add-key", False)
assert response.status_code == 202

keyslots = snap_http.get_keyslots().result
Expand All @@ -37,7 +37,7 @@ def test_add_recovery_key():
def test_replace_recovery_key():
"""Test replacing a recovery key."""
key_id = snap_http.generate_recovery_key().result["key-id"]
response = wait_for(snap_http.update_recovery_key)(
response, _ = wait_for(snap_http.update_recovery_key)(
key_id, "test-replace-key", False
)
assert response.status_code == 202
Expand All @@ -48,7 +48,7 @@ def test_replace_recovery_key():
)

key_id = snap_http.generate_recovery_key().result["key-id"]
response = wait_for(snap_http.update_recovery_key)(key_id, "test-replace-key", True)
response, _ = wait_for(snap_http.update_recovery_key)(key_id, "test-replace-key", True)
assert response.status_code == 202

keyslots = snap_http.get_keyslots().result
Expand Down