Skip to content

Adjust status message for v1 policies unlocked by another user and fix cli-tests/t_v1_policy#237

Merged
ebiggers merged 2 commits intogoogle:masterfrom
ebiggers:t_v1_policy_fix
Jun 13, 2020
Merged

Adjust status message for v1 policies unlocked by another user and fix cli-tests/t_v1_policy#237
ebiggers merged 2 commits intogoogle:masterfrom
ebiggers:t_v1_policy_fix

Conversation

@ebiggers
Copy link
Collaborator

No description provided.

ebiggers added 2 commits June 13, 2020 10:06
The test user's user keyring is still linked into root's user keyring at
the end of the test.  This is making the test flaky, as there is a
failure that only occurs the first time it is run.  Fix the test to
restore the initial state.  This makes it consistently fail (to be fixed
by the next commit).
When 'fscrypt status DIR' detects that a v1-encrypted directory is still
usable but its key seems to be absent, it shows the status as
"Unlocked: Partially (incompletely locked)".  But actually it can also
be the case that the directory is unlocked by another user.  Adjust the
status message accordingly.

This commit also fixes cli-tests/t_v1_policy.
@ebiggers ebiggers merged commit d4c6fc5 into google:master Jun 13, 2020
@ebiggers ebiggers deleted the t_v1_policy_fix branch June 13, 2020 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant