Commit 23e1d054 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

iotests: Let 245 pass on tmpfs 



tmpfs does not support O_DIRECT.  Detect this case, and skip flipping
@direct if the filesystem does not support it.

Fixes: bf3e50f6
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 13c24eda

tests/qemu-iotests/245

+8 −2
Original line number Diff line number Diff line
@@ -209,6 +209,12 @@ class TestBlockdevReopen(iotests.QMPTestCase): 


    # Reopen an image several times changing some of its options

    def test_reopen(self):

        # Check whether the filesystem supports O_DIRECT

        if 'O_DIRECT' in qemu_io('-f', 'raw', '-t', 'none', '-c', 'quit', hd_path[0]):

            supports_direct = False

        else:

            supports_direct = True



        # Open the hd1 image passing all backing options

        opts = hd_opts(1)

        opts['backing'] = hd_opts(0)
@@ -231,9 +237,9 @@ class TestBlockdevReopen(iotests.QMPTestCase): 
        self.assert_qmp(self.get_node('hd1'), 'cache/writeback', True)

        self.assert_qmp(self.get_node('hd1'), 'cache/direct', False)

        self.assert_qmp(self.get_node('hd1'), 'cache/no-flush', False)

        self.reopen(opts, {'cache': { 'direct': True, 'no-flush': True }})

        self.reopen(opts, {'cache': { 'direct': supports_direct, 'no-flush': True }})

        self.assert_qmp(self.get_node('hd1'), 'cache/writeback', True)

        self.assert_qmp(self.get_node('hd1'), 'cache/direct', True)

        self.assert_qmp(self.get_node('hd1'), 'cache/direct', supports_direct)

        self.assert_qmp(self.get_node('hd1'), 'cache/no-flush', True)



        # Reopen again with the original options