openstack/ironic
Code Issues Proposed changes

Merge "Reduce running time of test_different_sizes"

Browse Source
This commit is contained in:
Jenkins 2014-08-11 16:01:45 +00:00 committed by Gerrit Code Review
commit dc8418d22c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic/tests/drivers/test_deploy_utils.py
View File

@ -15,7 +15,6 @@
# under the License. # under the License.
import fixtures import fixtures
import itertools
import mock import mock
import os import os
import tempfile import tempfile
@ -687,10 +686,8 @@ class RealFilePartitioningTestCase(tests_base.TestCase):
def test_different_sizes(self): def test_different_sizes(self):
# NOTE(dtantsur): Keep this list in order with expected partitioning # NOTE(dtantsur): Keep this list in order with expected partitioning
fields = ['ephemeral_mb', 'swap_mb', 'root_mb'] fields = ['ephemeral_mb', 'swap_mb', 'root_mb']
variants = itertools.product([0, 1, 5], repeat=3) variants = ((0, 0, 12), (4, 2, 8), (0, 4, 10), (5, 0, 10))
for variant in variants: for variant in variants:
if variant == (0, 0, 0):
continue
kwargs = dict(zip(fields, variant)) kwargs = dict(zip(fields, variant))
self._run_without_root(utils.work_on_disk, self.file.name, self._run_without_root(utils.work_on_disk, self.file.name,
ephemeral_format='ext4', node_uuid='', ephemeral_format='ext4', node_uuid='',