master
test: Fold expect_keyid into create_key and suchlike
TEST: Explicitly use bash
tests/timeout: test actions on an expired keyring as well