From 97a6af4eb407702885fee30b94c96e5900bb0f8f Mon Sep 17 00:00:00 2001 From: mulhern Date: Thu, 11 Jun 2015 14:30:34 -0400 Subject: [PATCH] Make LUKS format resizable. Related: #56 * Set _resizable True. * Set up resize class. * Fix up size tests that break when LUKS format becomes resizable. Signed-off-by: mulhern --- blivet/formats/luks.py | 2 ++ tests/formats_test/luks_test.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/blivet/formats/luks.py b/blivet/formats/luks.py index df24ee119..dc17f0229 100644 --- a/blivet/formats/luks.py +++ b/blivet/formats/luks.py @@ -48,6 +48,8 @@ class LUKS(DeviceFormat): _minSize = crypto.LUKS_METADATA_SIZE _plugin = availability.BLOCKDEV_CRYPTO_PLUGIN _sizeinfoClass = lukstasks.LUKSSize + _resizeClass = lukstasks.LUKSResize + _resizable = True def __init__(self, **kwargs): """ diff --git a/tests/formats_test/luks_test.py b/tests/formats_test/luks_test.py index 76bb862a3..d6127f144 100755 --- a/tests/formats_test/luks_test.py +++ b/tests/formats_test/luks_test.py @@ -53,11 +53,14 @@ def testSize(self): # update the size info self.fmt.updateSizeInfo() + # set target size to imitate FS constructor + self.fmt.targetSize = self.fmt._size + # the size is greater than zero and less than the size of the device self.assertLess(self.fmt.size, self.DEFAULT_STORE_SIZE) self.assertGreater(self.fmt.size, Size(0)) self.assertEqual(self.fmt.currentSize, self.fmt.size) - self.assertEqual(self.fmt.targetSize, Size(0)) + self.assertEqual(self.fmt.targetSize, self.fmt.size) self.fmt.teardown()