From 39aa50022a16bc455469bd9e1d5c493f3663ecca Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 5 Apr 2018 08:29:33 -0700 Subject: [PATCH] Fix rpm_key test on Fedora 27. --- test/integration/targets/rpm_key/tasks/rpm_key.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/targets/rpm_key/tasks/rpm_key.yaml b/test/integration/targets/rpm_key/tasks/rpm_key.yaml index 8502871a1dc..4c0672d2d96 100644 --- a/test/integration/targets/rpm_key/tasks/rpm_key.yaml +++ b/test/integration/targets/rpm_key/tasks/rpm_key.yaml @@ -47,7 +47,7 @@ - name: confirm that signature check failed assert: that: - - "'MISSING KEYS' in sl_check.stdout" + - "'MISSING KEYS' in sl_check.stdout or 'SIGNATURES NOT OK' in sl_check.stdout" - "sl_check.failed" - name: remove EPEL GPG key from keyring (idempotent) @@ -91,7 +91,7 @@ - name: confirm that signature check succeeded assert: - that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout" + that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout or 'digests signatures OK' in sl_check.stdout" - name: remove GPG key from url rpm_key: @@ -106,7 +106,7 @@ - name: confirm that signature check failed assert: that: - - "'MISSING KEYS' in sl_check.stdout" + - "'MISSING KEYS' in sl_check.stdout or 'SIGNATURES NOT OK' in sl_check.stdout" - "sl_check.failed" - name: add GPG key from url @@ -120,7 +120,7 @@ - name: confirm that signature check succeeded assert: - that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout" + that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout or 'digests signatures OK' in sl_check.stdout" - name: remove all keys from key ring shell: "rpm -q gpg-pubkey | xargs rpm -e" @@ -136,7 +136,7 @@ - name: confirm that signature check succeeded assert: - that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout" + that: "'rsa sha1 (md5) pgp md5 OK' in sl_check.stdout or 'digests signatures OK' in sl_check.stdout" # # Cleanup