From 694285d29c37b4aad3aa9e12cd9d5a5e0f0c46eb Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Jun 13 2015 13:07:25 +0000
Subject: Merge branch 'master' of github.com:CentOS/sig-core-t_functional


---

diff --git a/AUTHORS b/AUTHORS
index 0fa1c83..90c60dc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,3 +14,4 @@ Saager Mhatre <saager.mhatre@gmail.com>
 Iain Douglas <centos@1n6.org.uk>
 Anssi Johansson <centos@miuku.net>
 Matej Habrnal <mhabrnal@redhat.com>
+Akemi Yagi <amyagi@gmail.com>
diff --git a/tests/0_common/20_upgrade_all.sh b/tests/0_common/20_upgrade_all.sh
index 49affe6..d15a082 100755
--- a/tests/0_common/20_upgrade_all.sh
+++ b/tests/0_common/20_upgrade_all.sh
@@ -4,4 +4,8 @@ t_Log "Running $0 - test that all updates can be applied to this machine cleanly
 
 yum -d0 -y upgrade
 
+t_Log "Running $0 - listing all used/available packages"
+
+yum list
+
 t_CheckExitStatus $?
diff --git a/tests/p_kernel/kernel_centos_keyring.sh b/tests/p_kernel/kernel_centos_keyring.sh
index 9d66b93..533c238 100755
--- a/tests/p_kernel/kernel_centos_keyring.sh
+++ b/tests/p_kernel/kernel_centos_keyring.sh
@@ -8,7 +8,7 @@ if [ "$centos_ver" = "7" ] ; then
   for id in kpatch "Driver update" kernel
   do
     t_Log "Verifying x.509 CentOS ${id}"
-    grep -i "CentOS Linux ${id} signing key" /var/log/dmesg > /dev/null 2>&1
+    keyctl list %:.system_keyring | grep -i "CentOS Linux ${id} signing key" > /dev/null 2>&1
     t_CheckExitStatus $?
   done
 else