Make gpg tests more resilient
#875
Conversation
tests/test_gpg.py
Outdated
|
|
||
| # Because we imported this key into a temporary directory, | ||
| # we should only have one key in the keyring. | ||
| if len(fingerprints) == 1: |
There was a problem hiding this comment.
Is there a reason you didn't make this an assertion? Otherwise it seems like there needs to be an else case here that throws an exception or pytest.fails
tests/test_gpg.py
Outdated
| fingerprints = find_fps_from_gpg_output(p) | ||
|
|
||
| # Especially during development, sd-gpg may contain more than one key | ||
| if expected_fp and expected_fp in fingerprints: |
tests/test_gpg.py
Outdated
| local_fp = get_local_fp() | ||
| remote_fp = get_remote_fp(expected_fp=local_fp) | ||
|
|
||
| self.assertIsNotNone(local_fp, "Local key not found") |
There was a problem hiding this comment.
This covers what I mentioned above but I think it would be better for the assertions to be closer to what they are asserting.
|
Thanks Kunal, will pick this back up but need to reprov a 4.1 env first -- doing that part today, so may not get back to the PR til tomorrow. |
|
From-scratch 4.1 reprovisioning completed without issues or errors, will poke this tomorrow :) |
- Succeed if expected key is present in sd-gpg - Fail if no key is present locally or remotely
eloquence
force-pushed
the
gpg-tests
branch
2 times, most recently
from
66571e1 to
eb5b6fe
Compare
|
Thanks @legoktm - I've reorganized the file a bit, tell me what you think. I did not see a good reason to have the GPG test setup outside the class so it's integrated now. I've still tried to group the assertions in the test method but avoided the use of conditionals in the test helper. |
Status
Ready for review
Description of Changes
Fixes #874
Changes proposed in this pull request:
Testing
Prior to testing,
make clonefrom this branch indom0.Ensure you have a configured workstation and
sd-journalist.secandconfig.jsonpresent indom0.make test-gpgpasses (if not, initial setup may have issues)Replace
dom0sd-journalist.secwith a different key not provisioned insd-gpgmake test-gpgfailsImport the new key manually on
sd-gpgviagpg --importmake test-gpgpassesRemove the new key on
sd-gpgviagpg --delete-secret-keyandgpg--delete-keymake test-gpgfailsRestore original
dom0configmake test-gpgpasses