proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-01-01 05:16:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/t/storage: change plaintext_name to include testname

Browse Source 
Setting the plaintext name to include the testname makes debugging failures
easier.

Also for convenience, create service_name field in setup method, for use
in tests and/or teardown method.
This commit is contained in:
Dan Streetman 2019-07-21 09:28:35 -04:00
parent 5da4807394
commit 02df3e5aa4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/tests/storage vendored
View File

@ -49,8 +49,10 @@ class FakeDriveTestBase(unittest.TestCase):
class CryptsetupTest(FakeDriveTestBase):
def setUp(self):
self.plaintext_name = 'testcrypt1'
testname = self.id().split('.')[-1]
self.plaintext_name = 'testcrypt_%s' % testname
self.plaintext_dev = '/dev/mapper/' + self.plaintext_name
self.service_name = 'systemd-cryptsetup@%s.service' % self.plaintext_name
if os.path.exists(self.plaintext_dev):
self.fail('%s exists already' % self.plaintext_dev)
@ -67,9 +69,9 @@ class CryptsetupTest(FakeDriveTestBase):
os.waitpid(self.password_agent, 0)
self.password_agent = None
subprocess.call(['umount', self.plaintext_dev], stderr=subprocess.DEVNULL)
subprocess.call(['systemctl', 'start', '--no-ask-password', 'systemd-cryptsetup@%s.service' % self.plaintext_name],
subprocess.call(['systemctl', 'start', '--no-ask-password', self.service_name],
stderr=subprocess.STDOUT)
subprocess.call(['systemctl', 'stop', 'systemd-cryptsetup@%s.service' % self.plaintext_name],
subprocess.call(['systemctl', 'stop', self.service_name],
stderr=subprocess.STDOUT)
if os.path.exists('/etc/crypttab'):
os.unlink('/etc/crypttab')