summaryrefslogtreecommitdiff
path: root/tests/keyctl/listing/valid/runtest.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tests/keyctl/listing/valid/runtest.sh')
-rw-r--r--tests/keyctl/listing/valid/runtest.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/keyctl/listing/valid/runtest.sh b/tests/keyctl/listing/valid/runtest.sh
index fe67bd4..872f3ed 100644
--- a/tests/keyctl/listing/valid/runtest.sh
+++ b/tests/keyctl/listing/valid/runtest.sh
@@ -11,8 +11,7 @@ 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
# validate the new keyring's name and type
marker "VALIDATE KEYRING"
@@ -30,8 +29,7 @@ expect_payload payload "keyring is empty"
# stick a key in the 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 it
marker "LIST KEYRING WITH ONE"
@@ -50,8 +48,7 @@ fi
# stick a second key in the keyring
marker "ADD KEY 2"
-create_key user snake skin $keyringid
-expect_keyid keyid2
+create_key --new=keyid2 user snake skin $keyringid
# check that we can see both keys
marker "LIST KEYRING WITH TWO"