summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2018-04-05 08:29:33 -0700
committerMatt Clay <matt@mystile.com>2018-04-05 08:56:21 -0700
commit39aa50022a16bc455469bd9e1d5c493f3663ecca (patch)
tree761b87a7a9b19aa019816495757653681c6dfa12
parent3f2c90914ec57316c118b689343ec578bd03762e (diff)
downloadansible-39aa50022a16bc455469bd9e1d5c493f3663ecca.tar.gz
Fix rpm_key test on Fedora 27.
-rw-r--r--test/integration/targets/rpm_key/tasks/rpm_key.yaml10
1 files 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 8502871a1d..4c0672d2d9 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