tests: fix signature resign/reattach test problems

The original tests to warn about overwriting signatures have never
worked after the multiple signature code was added (because we add a
new signature instead of overwriting the old one) update the tests to
check instead for the signature addition.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
James Bottomley 2017-10-18 17:01:21 -07:00
parent 79d0c44afb
commit 5b79ed2179
2 changed files with 10 additions and 2 deletions

View file

@ -1,4 +1,8 @@
#!/bin/bash -e #!/bin/bash -e
##
# The original warning is gone because we now do multiple signatures
# instead check that the second signature is added
##
signed="test.signed" signed="test.signed"
sig="test.sig" sig="test.sig"
@ -7,4 +11,4 @@ sig="test.sig"
cp "$image" "$signed" cp "$image" "$signed"
"$sbattach" --attach "$sig" "$signed" "$sbattach" --attach "$sig" "$signed"
"$sbattach" --attach "$sig" "$signed" 2>&1 | "$sbattach" --attach "$sig" "$signed" 2>&1 |
grep '^warning: overwriting' grep '^Image was already signed; adding additional signature'

View file

@ -1,7 +1,11 @@
#!/bin/bash -e #!/bin/bash -e
##
# The original warning is gone because we now do multiple signatures
# instead check that the second signature is added
##
signed="test.signed" signed="test.signed"
"$sbsign" --cert "$cert" --key "$key" --output "$signed" "$image" "$sbsign" --cert "$cert" --key "$key" --output "$signed" "$image"
"$sbsign" --cert "$cert" --key "$key" --output "$signed" "$signed" 2>&1 | "$sbsign" --cert "$cert" --key "$key" --output "$signed" "$signed" 2>&1 |
grep '^warning: overwriting' grep '^Image was already signed; adding additional signature'