summaryrefslogtreecommitdiff
path: root/tests/keyctl/timeout/valid/runtest.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tests/keyctl/timeout/valid/runtest.sh')
-rw-r--r--tests/keyctl/timeout/valid/runtest.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/keyctl/timeout/valid/runtest.sh b/tests/keyctl/timeout/valid/runtest.sh
index 4d772bb..5f7f2f3 100644
--- a/tests/keyctl/timeout/valid/runtest.sh
+++ b/tests/keyctl/timeout/valid/runtest.sh
@@ -10,13 +10,11 @@ echo "++++ BEGINNING TEST" >$OUTPUTFILE
# create a keyring and attach it to the session keyring
marker "ADD KEYRING"
-create_keyring wibble @s
-expect_keyid keyringid
+create_keyring --new=keyringid wibble @s
# create a key and attach it to the new keyring
marker "ADD KEY"
-create_key user lizard gizzard $keyringid
-expect_keyid keyid
+create_key --new=keyid user lizard gizzard $keyringid
# check that we can list the keyring
marker "LIST KEYRING"
@@ -77,8 +75,7 @@ unlink_key $keyid $keyringid
###############################################################################
# create a key and attach it to the new keyring
marker "ADD KEY"
-create_key user lizard gizzard $keyringid
-expect_keyid keyid
+create_key --new=keyid user lizard gizzard $keyringid
# set a silly timeout on the key
marker "SET BIG TIMEOUT"