| Message ID | aea3a5d63b6937d8bd87afb3741db6c09ea7436e.1504111803.git.jcody@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qemu-iotests: place output in unique dir | expand |
On 08/30/2017 11:52 AM, Jeff Cody wrote: > Add a function to attempt to 'blindly' remove a file, without > throwing an error if the file doesn't exist. > > Signed-off-by: Jeff Cody <jcody@redhat.com> > --- > tests/qemu-iotests/iotests.py | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 7233983..a2088c7 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -57,6 +57,13 @@ qemu_default_machine = os.environ.get('QEMU_DEFAULT_MACHINE') > socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') > debug = False > > +def blind_remove(filename): > + try: > + os.remove(filename) > + except OSError, error: I'm assuming this works for both python 2 and 3? > + if error.errno != errno.ENOENT: > + raise > + Weak, since I'm not the strongest at python, but you can add: Reviewed-by: Eric Blake <eblake@redhat.com>
On 08/30/2017 02:13 PM, Eric Blake wrote: > On 08/30/2017 11:52 AM, Jeff Cody wrote: >> Add a function to attempt to 'blindly' remove a file, without >> throwing an error if the file doesn't exist. >> >> Signed-off-by: Jeff Cody <jcody@redhat.com> >> --- >> tests/qemu-iotests/iotests.py | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py >> index 7233983..a2088c7 100644 >> --- a/tests/qemu-iotests/iotests.py >> +++ b/tests/qemu-iotests/iotests.py >> @@ -57,6 +57,13 @@ qemu_default_machine = os.environ.get('QEMU_DEFAULT_MACHINE') >> socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') >> debug = False >> >> +def blind_remove(filename): >> + try: >> + os.remove(filename) >> + except OSError, error: > > I'm assuming this works for both python 2 and 3? > Appears to be python2 specific syntax, actually. using "as error" appears to work in both 2.7 and 3.whatever, and according to http://python3porting.com/differences.html will work in 2.6 too. >> + if error.errno != errno.ENOENT: >> + raise >> + > > Weak, since I'm not the strongest at python, but you can add: > Reviewed-by: Eric Blake <eblake@redhat.com> >
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 7233983..a2088c7 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -57,6 +57,13 @@ qemu_default_machine = os.environ.get('QEMU_DEFAULT_MACHINE') socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') debug = False +def blind_remove(filename): + try: + os.remove(filename) + except OSError, error: + if error.errno != errno.ENOENT: + raise + def qemu_img(*args): '''Run qemu-img and return the exit code''' devnull = open('/dev/null', 'r+')
Add a function to attempt to 'blindly' remove a file, without throwing an error if the file doesn't exist. Signed-off-by: Jeff Cody <jcody@redhat.com> --- tests/qemu-iotests/iotests.py | 7 +++++++ 1 file changed, 7 insertions(+)