mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/selftest/signing: use a temporary directory for GPG home

Browse Source 
Instead of using a directory in the layer as the GPG home and carefully deleting
the right files from it, use tempfile to create a temporary directory which will
be cleaned up for us.

Also change the public/secret key variables to be absolute paths as they're
always used as absolute paths.

(From OE-Core rev: d4a5b5d11c6d7d5aba5f2eb88db091c1b98ef87c)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2016-07-21 16:28:45 +01:00
committed by Richard Purdie
parent ab075b6fb8
commit 5218c24c8b
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meta/lib/oeqa/selftest/signing.py
View File

@@ -12,30 +12,18 @@ from oeqa.utils.ftools import write_file
class Signing(oeSelfTest):
gpg_dir = ""
pub_key_name = 'key.pub'
secret_key_name = 'key.secret'
pub_key_path = ""
secret_key_path = ""
@classmethod
def setUpClass(cls):
# Import the gpg keys
cls.gpg_home_dir = tempfile.TemporaryDirectory(prefix="oeqa-signing-")
cls.gpg_dir = cls.gpg_home_dir.name
cls.gpg_dir = os.path.join(cls.testlayer_path, 'files/signing/')
cls.pub_key_path = os.path.join(cls.testlayer_path, 'files', 'signing', "key.pub")
cls.secret_key_path = os.path.join(cls.testlayer_path, 'files', 'signing', "key.secret")
# key.secret key.pub are located in gpg_dir
pub_key_location = cls.gpg_dir + cls.pub_key_name
secret_key_location = cls.gpg_dir + cls.secret_key_name
runCmd('gpg --homedir %s --import %s %s' % (cls.gpg_dir, pub_key_location, secret_key_location))
@classmethod
def tearDownClass(cls):
# Delete the files generated by 'gpg --import'
gpg_files = glob.glob(cls.gpg_dir + '*.gpg*')
random_seed_file = cls.gpg_dir + 'random_seed'
gpg_files.append(random_seed_file)
for gpg_file in gpg_files:
runCmd('rm -f ' + gpg_file)
runCmd('gpg --homedir %s --import %s %s' % (cls.gpg_dir, cls.pub_key_path, cls.secret_key_path))
@testcase(1362)
def test_signing_packages(self):
@@ -57,7 +45,7 @@ class Signing(oeSelfTest):
feature = 'INHERIT += "sign_rpm"\n'
feature += 'RPM_GPG_PASSPHRASE = "test123"\n'
feature += 'RPM_GPG_NAME = "testuser"\n'
feature += 'RPM_GPG_PUBKEY = "%s%s"\n' % (self.gpg_dir, self.pub_key_name)
feature += 'RPM_GPG_PUBKEY = "%s"\n' % self.pub_key_path
feature += 'GPG_PATH = "%s"\n' % self.gpg_dir
self.write_config(feature)
@@ -81,8 +69,8 @@ class Signing(oeSelfTest):
# Use a temporary rpmdb
rpmdb = tempfile.mkdtemp(prefix='oeqa-rpmdb')
runCmd('%s/rpm --define "_dbpath %s" --import %s%s' %
(staging_bindir_native, rpmdb, self.gpg_dir, self.pub_key_name))
runCmd('%s/rpm --define "_dbpath %s" --import %s' %
(staging_bindir_native, rpmdb, self.pub_key_path))
ret = runCmd('%s/rpm --define "_dbpath %s" --checksig %s' %
(staging_bindir_native, rpmdb, pkg_deploy))