Skip to content

Fix timestamp tests #1406

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

Merged
merged 3 commits into from
May 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ jobs:

# Ensure Timestamp Authority tests are not skipped by
# having pytest show skipped tests and verifying ours are running
set -o pipefail
make test TEST_ARGS="-m timestamp_authority -rs" | tee output
! grep -q "skipping test that requires a Timestamp Authority" output || (echo "ERROR: Found skip message" && exit 1)
env:
Expand Down
39 changes: 33 additions & 6 deletions test/assets/tsa/trust_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,39 @@
]
},
"signing_config": {
"ca_url": "https://fulcio.sigstage.dev",
"tlog_urls": [
"https://rekor.sigstage.dev"
"mediaType": "application/vnd.dev.sigstore.signingconfig.v0.2+json",
"caUrls": [
{
"url": "https://fulcio.sigstage.dev",
"majorApiVersion": 1,
"validFor": {
"start": "2022-04-14T21:38:40.000Z"
}
}
],
"tsa_urls": [
"placeholder-value"
]
"rekorTlogUrls": [
{
"url": "https://rekor.sigstage.dev",
"majorApiVersion": 1,
"validFor": {
"start": "2021-01-12T11:53:27.000Z"
}
}
],
"tsaUrls": [
{
"url": "placeholder",
"majorApiVersion": 1,
"validFor": {
"start": "2024-11-07T14:59:40.000Z"
}
}
],
"rekorTlogConfig": {
"selector": "ANY"
},
"tsaConfig": {
"selector": "ANY"
}
}
}
2 changes: 1 addition & 1 deletion test/unit/test_sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def sig_ctx(self, asset, tsa_url) -> SigningContext:
asset("tsa/trust_config.json").read_text()
)

trust_config._inner.signing_config.tsa_urls[0] = tsa_url
trust_config._inner.signing_config.tsa_urls[0].url = tsa_url

return SigningContext.from_trust_config(trust_config)

Expand Down
Loading