summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r--meta/lib/oeqa/selftest/signing.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/signing.py b/meta/lib/oeqa/selftest/signing.py
index 006afbef15..a9b135aab4 100644
--- a/meta/lib/oeqa/selftest/signing.py
+++ b/meta/lib/oeqa/selftest/signing.py
@@ -27,7 +27,7 @@ class Signing(oeSelfTest):
27 cls.pub_key_path = os.path.join(cls.testlayer_path, 'files', 'signing', "key.pub") 27 cls.pub_key_path = os.path.join(cls.testlayer_path, 'files', 'signing', "key.pub")
28 cls.secret_key_path = os.path.join(cls.testlayer_path, 'files', 'signing', "key.secret") 28 cls.secret_key_path = os.path.join(cls.testlayer_path, 'files', 'signing', "key.secret")
29 29
30 runCmd('gpg --homedir %s --import %s %s' % (cls.gpg_dir, cls.pub_key_path, cls.secret_key_path)) 30 runCmd('gpg --batch --homedir %s --import %s %s' % (cls.gpg_dir, cls.pub_key_path, cls.secret_key_path))
31 31
32 @testcase(1362) 32 @testcase(1362)
33 def test_signing_packages(self): 33 def test_signing_packages(self):
@@ -76,13 +76,13 @@ class Signing(oeSelfTest):
76 # Use a temporary rpmdb 76 # Use a temporary rpmdb
77 rpmdb = tempfile.mkdtemp(prefix='oeqa-rpmdb') 77 rpmdb = tempfile.mkdtemp(prefix='oeqa-rpmdb')
78 78
79 runCmd('%s/rpm --define "_dbpath %s" --import %s' % 79 runCmd('%s/rpmkeys --define "_dbpath %s" --import %s' %
80 (staging_bindir_native, rpmdb, self.pub_key_path)) 80 (staging_bindir_native, rpmdb, self.pub_key_path))
81 81
82 ret = runCmd('%s/rpm --define "_dbpath %s" --checksig %s' % 82 ret = runCmd('%s/rpmkeys --define "_dbpath %s" --checksig %s' %
83 (staging_bindir_native, rpmdb, pkg_deploy)) 83 (staging_bindir_native, rpmdb, pkg_deploy))
84 # tmp/deploy/rpm/i586/ed-1.9-r0.i586.rpm: rsa sha1 md5 OK 84 # tmp/deploy/rpm/i586/ed-1.9-r0.i586.rpm: rsa sha1 md5 OK
85 self.assertIn('rsa sha1 md5 OK', ret.output, 'Package signed incorrectly.') 85 self.assertIn('rsa sha1 (md5) pgp md5 OK', ret.output, 'Package signed incorrectly.')
86 shutil.rmtree(rpmdb) 86 shutil.rmtree(rpmdb)
87 87
88 @testcase(1382) 88 @testcase(1382)