Commit 58cc2ae1 authored by Fam Zheng's avatar Fam Zheng Committed by Stefan Hajnoczi
Browse files

qemu-iotests: Honour cache mode in iotests.py 



This will allow overriding cache mode from the "-c mode" option.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarWenchao Xia <xiawenc@linux.vnet.ibm.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 3baa8449

tests/qemu-iotests/iotests.py

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ qemu_args = os.environ.get('QEMU', 'qemu').strip().split(' ') 
imgfmt = os.environ.get('IMGFMT', 'raw')

imgproto = os.environ.get('IMGPROTO', 'file')

test_dir = os.environ.get('TEST_DIR', '/var/tmp')

cachemode = os.environ.get('CACHEMODE')



socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper')
@@ -96,7 +97,7 @@ class VM(object): 
        '''Add a virtio-blk drive to the VM'''

        options = ['if=virtio',

                   'format=%s' % imgfmt,

                   'cache=none',

                   'cache=%s' % cachemode,

                   'file=%s' % path,

                   'id=drive%d' % self._num_drives]

        if opts: