diff options
| author | Ben Howard <ben.howard@canonical.com> | 2013-08-20 09:58:30 -0600 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2013-08-20 09:58:30 -0600 |
| commit | 89d58c94d59c62dddea3f77b7a805c1afa2ca955 (patch) | |
| tree | 6b7cd86a373706730f0ec11f06517fc2a003f7c9 /tests/unittests/test_handler/test_handler_growpart.py | |
| parent | e683ab2baa3e67614edcd409122bd1aec99737e0 (diff) | |
| parent | b2ee0966793f3a9c7d8e92ce1c13b9583a9a76e7 (diff) | |
| download | vyos-cloud-init-89d58c94d59c62dddea3f77b7a805c1afa2ca955.tar.gz vyos-cloud-init-89d58c94d59c62dddea3f77b7a805c1afa2ca955.zip | |
Updated merge proposal with current tree
Diffstat (limited to 'tests/unittests/test_handler/test_handler_growpart.py')
| -rw-r--r-- | tests/unittests/test_handler/test_handler_growpart.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/unittests/test_handler/test_handler_growpart.py b/tests/unittests/test_handler/test_handler_growpart.py index b1b872b0..c0497e08 100644 --- a/tests/unittests/test_handler/test_handler_growpart.py +++ b/tests/unittests/test_handler/test_handler_growpart.py @@ -9,6 +9,7 @@ import errno import logging import os import re +import unittest # growpart: # mode: auto # off, on, auto, 'growpart', 'parted' @@ -121,6 +122,7 @@ class TestConfig(MockerTestCase): # Order must be correct self.mocker.order() + @unittest.skip("until LP: #1212444 fixed") def test_no_resizers_auto_is_fine(self): subp = self.mocker.replace(util.subp, passthrough=False) subp(['parted', '--help'], env={'LANG': 'C'}) @@ -142,6 +144,7 @@ class TestConfig(MockerTestCase): self.assertRaises(ValueError, self.handle, self.name, config, self.cloud_init, self.log, self.args) + @unittest.skip("until LP: #1212444 fixed") def test_mode_auto_prefers_parted(self): subp = self.mocker.replace(util.subp, passthrough=False) subp(['parted', '--help'], env={'LANG': 'C'}) |