| Message ID | 20190912001633.11372-2-jsnow@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iotests: use python logging | expand |
12.09.2019 3:16, John Snow wrote: > Like script_main, but doesn't require a single point of entry. > Replace all existing initialization sections with this drop-in replacement. > > This brings debug support to all existing script-style iotests. > > Note: supported_oses=['linux'] was omitted, as it is a default argument. But after this patch all test which didn't check os start to check linux (as it's default).. So all tests which worked on other platforms will now be skipped on these other platforms? Finally do we support something except linux for iotests? for bash tests _supported_os also used only with "Linux" in 87 tests.. May be we'd better drop both _supported_os and supported_oses alltogether, and don't care? Anyway, if we support only linux, any reason to skip almost all tests, if someone tries to run test on other platform? Let him run what he wants. > Signed-off-by: John Snow <jsnow@redhat.com> > --- [..] > +def execute_test(test_function=None, *args, **kwargs): > + """Run either unittest or script-style tests.""" > + > + debug = execute_setup_common(*args, **kwargs) > if not test_function: > - execute_unittest(output, verbosity, debug) > + execute_unittest(debug) > else: > test_function() > > +# This is called from script-style iotests without a single point of entry > +def script_initialize(*args, **kwargs): > + """Initialize script-style tests without running any tests.""" > + execute_setup_common(*args, **kwargs) > + > +# This is called from script-style iotests with a single point of entry > def script_main(test_function, *args, **kwargs): > """Run script-style tests outside of the unittest framework""" > execute_test(test_function, *args, **kwargs) > > +# This is called from unittest style iotests > def main(*args, **kwargs): > """Run tests using the unittest framework""" Hmm, now two different styles of code documenting used: comment and doc-string, both containing almost equal meaning.. I don't like it, still don't really mind. > execute_test(None, *args, **kwargs) >
On 9/16/19 10:56 AM, Vladimir Sementsov-Ogievskiy wrote: > 12.09.2019 3:16, John Snow wrote: >> Like script_main, but doesn't require a single point of entry. >> Replace all existing initialization sections with this drop-in replacement. >> >> This brings debug support to all existing script-style iotests. >> >> Note: supported_oses=['linux'] was omitted, as it is a default argument. > > But after this patch all test which didn't check os start to check linux > (as it's default).. So all tests which worked on other platforms will now > be skipped on these other platforms? > def verify_platform(supported_oses=['linux']): if True not in [sys.platform.startswith(x) for x in supported_oses]: notrun('not suitable for this OS: %s' % sys.platform) It was already the default. I didn't *make* it the default. There is no change here. Feel free to propose a fix, but I don't think it's within the scope of this series. > Finally do we support something except linux for iotests? > for bash tests _supported_os also used only with "Linux" in 87 tests.. > Evidently, not really. See bc521696607c5348fcd8a9e57b408d0ac0dbe2f8 > May be we'd better drop both _supported_os and supported_oses alltogether, > and don't care? > Beyond the scope of this series. > Anyway, if we support only linux, any reason to skip almost all tests, > if someone tries to run test on other platform? Let him run what he wants. Maybe true, maybe not. > >> Signed-off-by: John Snow <jsnow@redhat.com> >> --- > > [..] > >> +def execute_test(test_function=None, *args, **kwargs): >> + """Run either unittest or script-style tests.""" >> + >> + debug = execute_setup_common(*args, **kwargs) >> if not test_function: >> - execute_unittest(output, verbosity, debug) >> + execute_unittest(debug) >> else: >> test_function() >> >> +# This is called from script-style iotests without a single point of entry >> +def script_initialize(*args, **kwargs): >> + """Initialize script-style tests without running any tests.""" >> + execute_setup_common(*args, **kwargs) >> + >> +# This is called from script-style iotests with a single point of entry >> def script_main(test_function, *args, **kwargs): >> """Run script-style tests outside of the unittest framework""" >> execute_test(test_function, *args, **kwargs) >> >> +# This is called from unittest style iotests >> def main(*args, **kwargs): >> """Run tests using the unittest framework""" > > > Hmm, now two different styles of code documenting used: comment and doc-string, > both containing almost equal meaning.. I don't like it, still don't really mind. I think I was trying to document what the function /does/ separately from a note about explaining how and where it is used. It's quite nearly redundant and if it's distracting I can remove it.
16.09.2019 19:32, John Snow wrote: > > > On 9/16/19 10:56 AM, Vladimir Sementsov-Ogievskiy wrote: >> 12.09.2019 3:16, John Snow wrote: >>> Like script_main, but doesn't require a single point of entry. >>> Replace all existing initialization sections with this drop-in replacement. >>> >>> This brings debug support to all existing script-style iotests. >>> >>> Note: supported_oses=['linux'] was omitted, as it is a default argument. >> >> But after this patch all test which didn't check os start to check linux >> (as it's default).. So all tests which worked on other platforms will now >> be skipped on these other platforms? >> > > def verify_platform(supported_oses=['linux']): > if True not in [sys.platform.startswith(x) for x in supported_oses]: > notrun('not suitable for this OS: %s' % sys.platform) > > > It was already the default. I didn't *make* it the default. Yes. But for some tests, verify_platform wasn't called before this patch at all. And now it is called and checks "linux". It's the change. Or what I miss? > There is no > change here. Feel free to propose a fix, but I don't think it's within > the scope of this series. > >> Finally do we support something except linux for iotests? >> for bash tests _supported_os also used only with "Linux" in 87 tests.. >> > > Evidently, not really. See bc521696607c5348fcd8a9e57b408d0ac0dbe2f8 > >> May be we'd better drop both _supported_os and supported_oses alltogether, >> and don't care? >> > > Beyond the scope of this series. > >> Anyway, if we support only linux, any reason to skip almost all tests, >> if someone tries to run test on other platform? Let him run what he wants. > > Maybe true, maybe not. > >> >>> Signed-off-by: John Snow <jsnow@redhat.com> >>> --- >> >> [..] >> >>> +def execute_test(test_function=None, *args, **kwargs): >>> + """Run either unittest or script-style tests.""" >>> + >>> + debug = execute_setup_common(*args, **kwargs) >>> if not test_function: >>> - execute_unittest(output, verbosity, debug) >>> + execute_unittest(debug) >>> else: >>> test_function() >>> >>> +# This is called from script-style iotests without a single point of entry >>> +def script_initialize(*args, **kwargs): >>> + """Initialize script-style tests without running any tests.""" >>> + execute_setup_common(*args, **kwargs) >>> + >>> +# This is called from script-style iotests with a single point of entry >>> def script_main(test_function, *args, **kwargs): >>> """Run script-style tests outside of the unittest framework""" >>> execute_test(test_function, *args, **kwargs) >>> >>> +# This is called from unittest style iotests >>> def main(*args, **kwargs): >>> """Run tests using the unittest framework""" >> >> >> Hmm, now two different styles of code documenting used: comment and doc-string, >> both containing almost equal meaning.. I don't like it, still don't really mind. > > I think I was trying to document what the function /does/ separately > from a note about explaining how and where it is used. It's quite nearly > redundant and if it's distracting I can remove it. >
On 9/16/19 12:39 PM, Vladimir Sementsov-Ogievskiy wrote: > 16.09.2019 19:32, John Snow wrote: >> >> >> On 9/16/19 10:56 AM, Vladimir Sementsov-Ogievskiy wrote: >>> 12.09.2019 3:16, John Snow wrote: >>>> Like script_main, but doesn't require a single point of entry. >>>> Replace all existing initialization sections with this drop-in replacement. >>>> >>>> This brings debug support to all existing script-style iotests. >>>> >>>> Note: supported_oses=['linux'] was omitted, as it is a default argument. >>> >>> But after this patch all test which didn't check os start to check linux >>> (as it's default).. So all tests which worked on other platforms will now >>> be skipped on these other platforms? >>> >> >> def verify_platform(supported_oses=['linux']): >> if True not in [sys.platform.startswith(x) for x in supported_oses]: >> notrun('not suitable for this OS: %s' % sys.platform) >> >> >> It was already the default. I didn't *make* it the default. > > Yes. But for some tests, verify_platform wasn't called before this patch at all. > And now it is called and checks "linux". It's the change. Or what I miss? > I guess there are more than I thought. (I thought it was just one, based on a discussion with Philippe.) So, you're right: there are more tests now that will refuse to run on non-Linux platforms. Those tests are: 206 207 208 209 210 211 212 213 218 219 235 236 237 238 242 246 248 254 255 256 What sets these apart from the other python-based tests? Nothing in particular? Just depends on who copied from whom that day. I don't think there's any rhyme or reason to any of it. I don't really have a BSD or OSX machine to test which ones should and should not be limited, either. Kevin, do you remember why we added these checks? --js
On 9/16/19 10:56 AM, Vladimir Sementsov-Ogievskiy wrote: > 12.09.2019 3:16, John Snow wrote: >> Like script_main, but doesn't require a single point of entry. >> Replace all existing initialization sections with this drop-in replacement. >> >> This brings debug support to all existing script-style iotests. >> >> Note: supported_oses=['linux'] was omitted, as it is a default argument. > > But after this patch all test which didn't check os start to check linux > (as it's default).. So all tests which worked on other platforms will now > be skipped on these other platforms? > > Finally do we support something except linux for iotests? > for bash tests _supported_os also used only with "Linux" in 87 tests.. > > May be we'd better drop both _supported_os and supported_oses alltogether, > and don't care? > > Anyway, if we support only linux, any reason to skip almost all tests, > if someone tries to run test on other platform? Let him run what he wants. > Currently, the following tests are python: 030 040 041 044 045 055 056 057 065 093 096 118 124 129 132 136 139 147 148 149 151 152 155 163 165 169 194 196 199 202 203 205 206 207 208 209 210 211 212 213 216 218 219 222 224 228 234 235 236 237 238 242 245 246 248 254 255 256 257 258 262 266 And as it stands, none of the script-style python tests we've selected to run in `make check` fail on the FreeBSD platform. So as an experiment, I lifted the restriction on python tests. I kept running ./check until I found some invocation that they didn't skip. Failures: 045 147 149 169 194 199 211 Not too bad... 045: +qemu.machine.QEMUMachineError: socket_scm_helper does not exist 149: Wants to use 'sudo', but our freebsd image doesn't have that. 194: +OSError: AF_UNIX path too long 211: -[{ "start": 0, "length": 3072, "depth": 0, "zero": false, "data": true, "offset": 1024}, -{ "start": 3072, "length": 33551360, "depth": 0, "zero": true, "data": true, "offset": 4096}] +[{ "start": 0, "length": 31744, "depth": 0, "zero": false, "data": true, "offset": 1024}, +{ "start": 31744, "length": 33522688, "depth": 0, "zero": true, "data": true, "offset": 32768}] 149 can probably be fixed, and 194 and 211 I have fail in similar ways on my own Linux machine, so that's probably not BSD's fault. Interestingly, 169 and 199, bitmap migration related tests, cause a SIGSEGV in QEMU ... 169: +EEEE....EEEE........ +WARNING:qemu.machine:qemu received signal 6: /usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 -chardev socket,id=mon,path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/tmprpc0idbx/qemub-26617-monitor.sock -mon chardev=mon,mode=control -display none -vga none -qtest unix:path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/qemub-26617-qtest.sock -machine accel=qtest -nodefaults -display none -machine accel=qtest -incoming defer -drive if=virtio,id=drive0,file=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/disk_b,format=qcow2,cache=writeback The common thread in 169 is the +migbitmap trait, which ... makes me a little nervous, of course! 199: +WARNING:qemu.machine:qemu received signal 6: /usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 -chardev socket,id=mon,path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/tmpvzpyc9j6/qemub-30170-monitor.sock -mon chardev=mon,mode=control -display none -vga none -qtest unix:path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/qemub-30170-qtest.sock -machine accel=qtest -nodefaults -display none -machine accel=qtest -drive if=virtio,id=drive0,file=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/disk_b,format=qcow2,cache=none -incoming exec: cat '/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/mig_fifo' +E Vladimir, I was able to provoke this error by editing ./tests/vm/Makefile.include and removing the --snapshot invocation, then using `make vm-build-freebsd` and finally typing `make vm-ssh-freebsd` to open up a shell. Then the tricks are the usual ones; navigate to iotests directory, ./check -v -qcow2 169, etc. You'll need to create a build that allows Python tests to run; do it before you run the snapshot-less build. aaand lastly, running `make check` doesn't happen to call any of the tests that appear broken on FreeBSD right now, so I'm just going to go ahead and say we can open Pandora's box and make the default python test behavior to run on any OS, and start re-blacklisting the edge-cases as we find them. As far as iotests go, there are a few new broken ones that surface, but they won't gate Peter Maydell's build process because they don't get run by 'make check'. I think it's a safe move to make. --js
18.09.2019 1:29, John Snow wrote: > > > On 9/16/19 10:56 AM, Vladimir Sementsov-Ogievskiy wrote: >> 12.09.2019 3:16, John Snow wrote: >>> Like script_main, but doesn't require a single point of entry. >>> Replace all existing initialization sections with this drop-in replacement. >>> >>> This brings debug support to all existing script-style iotests. >>> >>> Note: supported_oses=['linux'] was omitted, as it is a default argument. >> >> But after this patch all test which didn't check os start to check linux >> (as it's default).. So all tests which worked on other platforms will now >> be skipped on these other platforms? >> >> Finally do we support something except linux for iotests? >> for bash tests _supported_os also used only with "Linux" in 87 tests.. >> >> May be we'd better drop both _supported_os and supported_oses alltogether, >> and don't care? >> >> Anyway, if we support only linux, any reason to skip almost all tests, >> if someone tries to run test on other platform? Let him run what he wants. >> > > Currently, the following tests are python: > > 030 040 041 044 045 055 056 057 065 093 096 118 124 129 132 136 139 147 > 148 149 151 152 155 163 165 169 194 196 199 202 203 205 206 207 208 209 > 210 211 212 213 216 218 219 222 224 228 234 235 236 237 238 242 245 246 > 248 254 255 256 257 258 262 266 > > And as it stands, none of the script-style python tests we've selected > to run in `make check` fail on the FreeBSD platform. > > So as an experiment, I lifted the restriction on python tests. I kept > running ./check until I found some invocation that they didn't skip. > > Failures: 045 147 149 169 194 199 211 > > Not too bad... > > 045: +qemu.machine.QEMUMachineError: socket_scm_helper does not exist > 149: Wants to use 'sudo', but our freebsd image doesn't have that. > 194: +OSError: AF_UNIX path too long > 211: > -[{ "start": 0, "length": 3072, "depth": 0, "zero": false, "data": true, > "offset": 1024}, > -{ "start": 3072, "length": 33551360, "depth": 0, "zero": true, "data": > true, "offset": 4096}] > +[{ "start": 0, "length": 31744, "depth": 0, "zero": false, "data": > true, "offset": 1024}, > +{ "start": 31744, "length": 33522688, "depth": 0, "zero": true, "data": > true, "offset": 32768}] > > > 149 can probably be fixed, and 194 and 211 I have fail in similar ways > on my own Linux machine, so that's probably not BSD's fault. > > Interestingly, 169 and 199, bitmap migration related tests, cause a > SIGSEGV in QEMU ... > > > 169: > +EEEE....EEEE........ > +WARNING:qemu.machine:qemu received signal 6: > /usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 > -chardev > socket,id=mon,path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/tmprpc0idbx/qemub-26617-monitor.sock > -mon chardev=mon,mode=control -display none -vga none -qtest > unix:path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/qemub-26617-qtest.sock > -machine accel=qtest -nodefaults -display none -machine accel=qtest > -incoming defer -drive > if=virtio,id=drive0,file=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/disk_b,format=qcow2,cache=writeback > > The common thread in 169 is the +migbitmap trait, which ... makes me a > little nervous, of course! > > > 199: > +WARNING:qemu.machine:qemu received signal 6: > /usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 > -chardev > socket,id=mon,path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/tmpvzpyc9j6/qemub-30170-monitor.sock > -mon chardev=mon,mode=control -display none -vga none -qtest > unix:path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/qemub-30170-qtest.sock > -machine accel=qtest -nodefaults -display none -machine accel=qtest > -drive > if=virtio,id=drive0,file=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/disk_b,format=qcow2,cache=none > -incoming exec: cat > '/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/mig_fifo' > +E > > > Vladimir, I was able to provoke this error by editing > ./tests/vm/Makefile.include and removing the --snapshot invocation, then > using `make vm-build-freebsd` and finally typing `make vm-ssh-freebsd` > to open up a shell. > > Then the tricks are the usual ones; navigate to iotests directory, > ./check -v -qcow2 169, etc. You'll need to create a build that allows > Python tests to run; do it before you run the snapshot-less build. > > Interesting, I'll try to reproduce. > > > aaand lastly, running `make check` doesn't happen to call any of the > tests that appear broken on FreeBSD right now, so I'm just going to go > ahead and say we can open Pandora's box and make the default python test > behavior to run on any OS, and start re-blacklisting the edge-cases as > we find them. > > As far as iotests go, there are a few new broken ones that surface, but > they won't gate Peter Maydell's build process because they don't get run > by 'make check'. > > I think it's a safe move to make. > > --js >
On 18/09/2019 00.29, John Snow wrote: > > > On 9/16/19 10:56 AM, Vladimir Sementsov-Ogievskiy wrote: [...] >> Finally do we support something except linux for iotests? >> for bash tests _supported_os also used only with "Linux" in 87 tests.. The iotests in the "auto" group are supposed to work on other OSes beside Linux, too, since they are run automatically during "make check" now. You can use github with cirrus-ci to check FreeBSD and macOS, see e.g.: https://cirrus-ci.com/build/5114679677943808 Travis has support for macOS, too. And to test them on OpenBSD (or FreeBSD), you can use the VM tests, e.g. something like this: make vm-build-openbsd J=8 BUILD_TARGET=check-block \ EXTRA_CONFIGURE_OPTS=--target-list=x86_64-softmmu > aaand lastly, running `make check` doesn't happen to call any of the > tests that appear broken on FreeBSD right now, so I'm just going to go > ahead and say we can open Pandora's box and make the default python test > behavior to run on any OS, and start re-blacklisting the edge-cases as > we find them. Sounds good. If it breaks on FreeBSD or macOS, we'll find out with cirrus-ci or Travis pretty soon. Thomas
18.09.2019 13:30, Vladimir Sementsov-Ogievskiy wrote: > 18.09.2019 1:29, John Snow wrote: >> >> >> On 9/16/19 10:56 AM, Vladimir Sementsov-Ogievskiy wrote: >>> 12.09.2019 3:16, John Snow wrote: >>>> Like script_main, but doesn't require a single point of entry. >>>> Replace all existing initialization sections with this drop-in replacement. >>>> >>>> This brings debug support to all existing script-style iotests. >>>> >>>> Note: supported_oses=['linux'] was omitted, as it is a default argument. >>> >>> But after this patch all test which didn't check os start to check linux >>> (as it's default).. So all tests which worked on other platforms will now >>> be skipped on these other platforms? >>> >>> Finally do we support something except linux for iotests? >>> for bash tests _supported_os also used only with "Linux" in 87 tests.. >>> >>> May be we'd better drop both _supported_os and supported_oses alltogether, >>> and don't care? >>> >>> Anyway, if we support only linux, any reason to skip almost all tests, >>> if someone tries to run test on other platform? Let him run what he wants. >>> >> >> Currently, the following tests are python: >> >> 030 040 041 044 045 055 056 057 065 093 096 118 124 129 132 136 139 147 >> 148 149 151 152 155 163 165 169 194 196 199 202 203 205 206 207 208 209 >> 210 211 212 213 216 218 219 222 224 228 234 235 236 237 238 242 245 246 >> 248 254 255 256 257 258 262 266 >> >> And as it stands, none of the script-style python tests we've selected >> to run in `make check` fail on the FreeBSD platform. >> >> So as an experiment, I lifted the restriction on python tests. I kept >> running ./check until I found some invocation that they didn't skip. >> >> Failures: 045 147 149 169 194 199 211 >> >> Not too bad... >> >> 045: +qemu.machine.QEMUMachineError: socket_scm_helper does not exist >> 149: Wants to use 'sudo', but our freebsd image doesn't have that. >> 194: +OSError: AF_UNIX path too long >> 211: >> -[{ "start": 0, "length": 3072, "depth": 0, "zero": false, "data": true, >> "offset": 1024}, >> -{ "start": 3072, "length": 33551360, "depth": 0, "zero": true, "data": >> true, "offset": 4096}] >> +[{ "start": 0, "length": 31744, "depth": 0, "zero": false, "data": >> true, "offset": 1024}, >> +{ "start": 31744, "length": 33522688, "depth": 0, "zero": true, "data": >> true, "offset": 32768}] >> >> >> 149 can probably be fixed, and 194 and 211 I have fail in similar ways >> on my own Linux machine, so that's probably not BSD's fault. >> >> Interestingly, 169 and 199, bitmap migration related tests, cause a >> SIGSEGV in QEMU ... >> >> >> 169: >> +EEEE....EEEE........ >> +WARNING:qemu.machine:qemu received signal 6: >> /usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 >> -chardev >> socket,id=mon,path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/tmprpc0idbx/qemub-26617-monitor.sock >> -mon chardev=mon,mode=control -display none -vga none -qtest >> unix:path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/qemub-26617-qtest.sock >> -machine accel=qtest -nodefaults -display none -machine accel=qtest >> -incoming defer -drive >> if=virtio,id=drive0,file=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/disk_b,format=qcow2,cache=writeback >> >> The common thread in 169 is the +migbitmap trait, which ... makes me a >> little nervous, of course! >> >> >> 199: >> +WARNING:qemu.machine:qemu received signal 6: >> /usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 >> -chardev >> socket,id=mon,path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/tmpvzpyc9j6/qemub-30170-monitor.sock >> -mon chardev=mon,mode=control -display none -vga none -qtest >> unix:path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/qemub-30170-qtest.sock >> -machine accel=qtest -nodefaults -display none -machine accel=qtest >> -drive >> if=virtio,id=drive0,file=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/disk_b,format=qcow2,cache=none >> -incoming exec: cat >> '/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/mig_fifo' >> +E >> >> >> Vladimir, I was able to provoke this error by editing >> ./tests/vm/Makefile.include and removing the --snapshot invocation, then >> using `make vm-build-freebsd` and finally typing `make vm-ssh-freebsd` >> to open up a shell. >> >> Then the tricks are the usual ones; navigate to iotests directory, >> ./check -v -qcow2 169, etc. You'll need to create a build that allows >> Python tests to run; do it before you run the snapshot-less build. >> >> > > Interesting, I'll try to reproduce. Could you provide more detailed steps? # make vm-build-freebsd VM-IMAGE freebsd ### Downloading install iso ... ### Preparing iso and disk image ... /root/.cache/qemu-vm/images/freebsd.img.install.iso.xz (1/1) 100 % 595,0 MiB / 851,1 MiB = 0,699 153 MiB/s 0:05 Failed to prepare guest environment Traceback (most recent call last): File "/work/src/qemu/master/tests/vm/basevm.py", line 353, in main return vm.build_image(args.image) File "/work/src/qemu/master/tests/vm/freebsd", line 86, in build_image img_tmp, self.size]) File "/usr/lib64/python3.7/subprocess.py", line 342, in check_call retcode = call(*popenargs, **kwargs) File "/usr/lib64/python3.7/subprocess.py", line 323, in call with Popen(*popenargs, **kwargs) as p: File "/usr/lib64/python3.7/subprocess.py", line 775, in __init__ restore_signals, start_new_session) File "/usr/lib64/python3.7/subprocess.py", line 1522, in _execute_child raise child_exception_type(errno_num, err_msg, err_filename) FileNotFoundError: [Errno 2] No such file or directory: 'qemu-img': 'qemu-img' make: *** [/work/src/qemu/master/tests/vm/Makefile.include:47: /root/.cache/qemu-vm/images/freebsd.img] Error 2 # ls qemu-img qemu-img What it wants? I've never done such cross-builds before..
On 9/18/19 12:44 PM, Vladimir Sementsov-Ogievskiy wrote: > 18.09.2019 13:30, Vladimir Sementsov-Ogievskiy wrote: >> 18.09.2019 1:29, John Snow wrote: >>> >>> >>> On 9/16/19 10:56 AM, Vladimir Sementsov-Ogievskiy wrote: >>>> 12.09.2019 3:16, John Snow wrote: >>>>> Like script_main, but doesn't require a single point of entry. >>>>> Replace all existing initialization sections with this drop-in replacement. >>>>> >>>>> This brings debug support to all existing script-style iotests. >>>>> >>>>> Note: supported_oses=['linux'] was omitted, as it is a default argument. >>>> >>>> But after this patch all test which didn't check os start to check linux >>>> (as it's default).. So all tests which worked on other platforms will now >>>> be skipped on these other platforms? >>>> >>>> Finally do we support something except linux for iotests? >>>> for bash tests _supported_os also used only with "Linux" in 87 tests.. >>>> >>>> May be we'd better drop both _supported_os and supported_oses alltogether, >>>> and don't care? >>>> >>>> Anyway, if we support only linux, any reason to skip almost all tests, >>>> if someone tries to run test on other platform? Let him run what he wants. >>>> >>> >>> Currently, the following tests are python: >>> >>> 030 040 041 044 045 055 056 057 065 093 096 118 124 129 132 136 139 147 >>> 148 149 151 152 155 163 165 169 194 196 199 202 203 205 206 207 208 209 >>> 210 211 212 213 216 218 219 222 224 228 234 235 236 237 238 242 245 246 >>> 248 254 255 256 257 258 262 266 >>> >>> And as it stands, none of the script-style python tests we've selected >>> to run in `make check` fail on the FreeBSD platform. >>> >>> So as an experiment, I lifted the restriction on python tests. I kept >>> running ./check until I found some invocation that they didn't skip. >>> >>> Failures: 045 147 149 169 194 199 211 >>> >>> Not too bad... >>> >>> 045: +qemu.machine.QEMUMachineError: socket_scm_helper does not exist >>> 149: Wants to use 'sudo', but our freebsd image doesn't have that. >>> 194: +OSError: AF_UNIX path too long >>> 211: >>> -[{ "start": 0, "length": 3072, "depth": 0, "zero": false, "data": true, >>> "offset": 1024}, >>> -{ "start": 3072, "length": 33551360, "depth": 0, "zero": true, "data": >>> true, "offset": 4096}] >>> +[{ "start": 0, "length": 31744, "depth": 0, "zero": false, "data": >>> true, "offset": 1024}, >>> +{ "start": 31744, "length": 33522688, "depth": 0, "zero": true, "data": >>> true, "offset": 32768}] >>> >>> >>> 149 can probably be fixed, and 194 and 211 I have fail in similar ways >>> on my own Linux machine, so that's probably not BSD's fault. >>> >>> Interestingly, 169 and 199, bitmap migration related tests, cause a >>> SIGSEGV in QEMU ... >>> >>> >>> 169: >>> +EEEE....EEEE........ >>> +WARNING:qemu.machine:qemu received signal 6: >>> /usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 >>> -chardev >>> socket,id=mon,path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/tmprpc0idbx/qemub-26617-monitor.sock >>> -mon chardev=mon,mode=control -display none -vga none -qtest >>> unix:path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/qemub-26617-qtest.sock >>> -machine accel=qtest -nodefaults -display none -machine accel=qtest >>> -incoming defer -drive >>> if=virtio,id=drive0,file=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/disk_b,format=qcow2,cache=writeback >>> >>> The common thread in 169 is the +migbitmap trait, which ... makes me a >>> little nervous, of course! >>> >>> >>> 199: >>> +WARNING:qemu.machine:qemu received signal 6: >>> /usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 >>> -chardev >>> socket,id=mon,path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/tmpvzpyc9j6/qemub-30170-monitor.sock >>> -mon chardev=mon,mode=control -display none -vga none -qtest >>> unix:path=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/qemub-30170-qtest.sock >>> -machine accel=qtest -nodefaults -display none -machine accel=qtest >>> -drive >>> if=virtio,id=drive0,file=/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/disk_b,format=qcow2,cache=none >>> -incoming exec: cat >>> '/usr/home/qemu/qemu-test.IfsR68/build/tests/qemu-iotests/scratch/mig_fifo' >>> +E >>> >>> >>> Vladimir, I was able to provoke this error by editing >>> ./tests/vm/Makefile.include and removing the --snapshot invocation, then >>> using `make vm-build-freebsd` and finally typing `make vm-ssh-freebsd` >>> to open up a shell. >>> >>> Then the tricks are the usual ones; navigate to iotests directory, >>> ./check -v -qcow2 169, etc. You'll need to create a build that allows >>> Python tests to run; do it before you run the snapshot-less build. >>> >>> >> >> Interesting, I'll try to reproduce. > > Could you provide more detailed steps? > > # make vm-build-freebsd > VM-IMAGE freebsd > ### Downloading install iso ... > ### Preparing iso and disk image ... > /root/.cache/qemu-vm/images/freebsd.img.install.iso.xz (1/1) > 100 % 595,0 MiB / 851,1 MiB = 0,699 153 MiB/s 0:05 > Failed to prepare guest environment > Traceback (most recent call last): > File "/work/src/qemu/master/tests/vm/basevm.py", line 353, in main > return vm.build_image(args.image) > File "/work/src/qemu/master/tests/vm/freebsd", line 86, in build_image > img_tmp, self.size]) > File "/usr/lib64/python3.7/subprocess.py", line 342, in check_call > retcode = call(*popenargs, **kwargs) > File "/usr/lib64/python3.7/subprocess.py", line 323, in call > with Popen(*popenargs, **kwargs) as p: > File "/usr/lib64/python3.7/subprocess.py", line 775, in __init__ > restore_signals, start_new_session) > File "/usr/lib64/python3.7/subprocess.py", line 1522, in _execute_child > raise child_exception_type(errno_num, err_msg, err_filename) > FileNotFoundError: [Errno 2] No such file or directory: 'qemu-img': 'qemu-img' > make: *** [/work/src/qemu/master/tests/vm/Makefile.include:47: /root/.cache/qemu-vm/images/freebsd.img] Error 2 > # ls qemu-img > qemu-img > > What it wants? I've never done such cross-builds before.. > uhhh, hm... No, I really just typed what you had done -- `make vm-build-freebsd` on my Fedora 30 host. I do happen to have qemu-img installed system-wide, maybe it's a requirement. I removed the '--snapshot' argument from the Makefile in that folder so that once the build finished I could SSH in to the image and poke around by running iotests manually. I wouldn't worry about it right now, exactly -- it might be a problem with the migration specification for "exec cat" that is causing an issue, if I had to guess. I can try to debug it later, but I won't be able to get to it too soon.
On 9/18/19 9:05 AM, Thomas Huth wrote: > On 18/09/2019 00.29, John Snow wrote: >> >> >> On 9/16/19 10:56 AM, Vladimir Sementsov-Ogievskiy wrote: > [...] >>> Finally do we support something except linux for iotests? >>> for bash tests _supported_os also used only with "Linux" in 87 tests.. > > The iotests in the "auto" group are supposed to work on other OSes > beside Linux, too, since they are run automatically during "make check" > now. You can use github with cirrus-ci to check FreeBSD and macOS, see > e.g.: https://cirrus-ci.com/build/5114679677943808 > > Travis has support for macOS, too. > > And to test them on OpenBSD (or FreeBSD), you can use the VM tests, e.g. > something like this: > > make vm-build-openbsd J=8 BUILD_TARGET=check-block \ > EXTRA_CONFIGURE_OPTS=--target-list=x86_64-softmmu > >> aaand lastly, running `make check` doesn't happen to call any of the >> tests that appear broken on FreeBSD right now, so I'm just going to go >> ahead and say we can open Pandora's box and make the default python test >> behavior to run on any OS, and start re-blacklisting the edge-cases as >> we find them. > > Sounds good. If it breaks on FreeBSD or macOS, we'll find out with > cirrus-ci or Travis pretty soon. > Yeah. It's annoying, but genuinely the quickest way to figure it out. Keep an eye on the v5 of this series for fallout. --js
diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149 index 4f363f295f..9fa97966c5 100755 --- a/tests/qemu-iotests/149 +++ b/tests/qemu-iotests/149 @@ -383,8 +383,7 @@ def test_once(config, qemu_img=False): # Obviously we only work with the luks image format -iotests.verify_image_format(supported_fmts=['luks']) -iotests.verify_platform() +iotests.script_initialize(supported_fmts=['luks']) # We need sudo in order to run cryptsetup to create # dm-crypt devices. This is safe to use on any diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index d746ab1e21..c8aeb6d0e4 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -21,8 +21,7 @@ import iotests -iotests.verify_image_format(supported_fmts=['qcow2', 'qed', 'raw']) -iotests.verify_platform(['linux']) +iotests.script_initialize(supported_fmts=['qcow2', 'qed', 'raw']) with iotests.FilePath('source.img') as source_img_path, \ iotests.FilePath('dest.img') as dest_img_path, \ diff --git a/tests/qemu-iotests/202 b/tests/qemu-iotests/202 index 581ca34d79..1271ac9459 100755 --- a/tests/qemu-iotests/202 +++ b/tests/qemu-iotests/202 @@ -24,8 +24,7 @@ import iotests -iotests.verify_image_format(supported_fmts=['qcow2']) -iotests.verify_platform(['linux']) +iotests.script_initialize(supported_fmts=['qcow2']) with iotests.FilePath('disk0.img') as disk0_img_path, \ iotests.FilePath('disk1.img') as disk1_img_path, \ diff --git a/tests/qemu-iotests/203 b/tests/qemu-iotests/203 index 4874a1a0d8..c40fe231ea 100755 --- a/tests/qemu-iotests/203 +++ b/tests/qemu-iotests/203 @@ -24,8 +24,7 @@ import iotests -iotests.verify_image_format(supported_fmts=['qcow2']) -iotests.verify_platform(['linux']) +iotests.script_initialize(supported_fmts=['qcow2']) with iotests.FilePath('disk0.img') as disk0_img_path, \ iotests.FilePath('disk1.img') as disk1_img_path, \ diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206 index 5bb738bf23..23ff2f624b 100755 --- a/tests/qemu-iotests/206 +++ b/tests/qemu-iotests/206 @@ -23,7 +23,7 @@ import iotests from iotests import imgfmt -iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.script_initialize(supported_fmts=['qcow2']) def blockdev_create(vm, options): result = vm.qmp_log('blockdev-create', diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207 index ec8c1d06f0..ab9e3b6747 100755 --- a/tests/qemu-iotests/207 +++ b/tests/qemu-iotests/207 @@ -24,7 +24,7 @@ import iotests import subprocess import re -iotests.verify_image_format(supported_fmts=['raw']) +iotests.script_initialize(supported_fmts=['raw']) iotests.verify_protocol(supported=['ssh']) def filter_hash(qmsg): diff --git a/tests/qemu-iotests/208 b/tests/qemu-iotests/208 index 1e202388dc..dfce6f9fe4 100755 --- a/tests/qemu-iotests/208 +++ b/tests/qemu-iotests/208 @@ -22,7 +22,7 @@ import iotests -iotests.verify_image_format(supported_fmts=['generic']) +iotests.script_initialize(supported_fmts=['generic']) with iotests.FilePath('disk.img') as disk_img_path, \ iotests.FilePath('disk-snapshot.img') as disk_snapshot_img_path, \ diff --git a/tests/qemu-iotests/209 b/tests/qemu-iotests/209 index 259e991ec6..a77f884166 100755 --- a/tests/qemu-iotests/209 +++ b/tests/qemu-iotests/209 @@ -22,7 +22,7 @@ import iotests from iotests import qemu_img_create, qemu_io, qemu_img_verbose, qemu_nbd, \ file_path -iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.script_initialize(supported_fmts=['qcow2']) disk, nbd_sock = file_path('disk', 'nbd-sock') nbd_uri = 'nbd+unix:///exp?socket=' + nbd_sock diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210 index 565e3b7b9b..5a7013cd34 100755 --- a/tests/qemu-iotests/210 +++ b/tests/qemu-iotests/210 @@ -23,7 +23,7 @@ import iotests from iotests import imgfmt -iotests.verify_image_format(supported_fmts=['luks']) +iotests.script_initialize(supported_fmts=['luks']) iotests.verify_protocol(supported=['file']) def blockdev_create(vm, options): diff --git a/tests/qemu-iotests/211 b/tests/qemu-iotests/211 index 6afc894f76..4d6aac497f 100755 --- a/tests/qemu-iotests/211 +++ b/tests/qemu-iotests/211 @@ -23,7 +23,7 @@ import iotests from iotests import imgfmt -iotests.verify_image_format(supported_fmts=['vdi']) +iotests.script_initialize(supported_fmts=['vdi']) iotests.verify_protocol(supported=['file']) def blockdev_create(vm, options): diff --git a/tests/qemu-iotests/212 b/tests/qemu-iotests/212 index 42b74f208b..ec35bceb11 100755 --- a/tests/qemu-iotests/212 +++ b/tests/qemu-iotests/212 @@ -23,7 +23,7 @@ import iotests from iotests import imgfmt -iotests.verify_image_format(supported_fmts=['parallels']) +iotests.script_initialize(supported_fmts=['parallels']) iotests.verify_protocol(supported=['file']) def blockdev_create(vm, options): diff --git a/tests/qemu-iotests/213 b/tests/qemu-iotests/213 index 5604f3cebb..3d2c024375 100755 --- a/tests/qemu-iotests/213 +++ b/tests/qemu-iotests/213 @@ -23,7 +23,7 @@ import iotests from iotests import imgfmt -iotests.verify_image_format(supported_fmts=['vhdx']) +iotests.script_initialize(supported_fmts=['vhdx']) iotests.verify_protocol(supported=['file']) def blockdev_create(vm, options): diff --git a/tests/qemu-iotests/216 b/tests/qemu-iotests/216 index 3c0ae54b44..7574bcc09f 100755 --- a/tests/qemu-iotests/216 +++ b/tests/qemu-iotests/216 @@ -23,8 +23,7 @@ import iotests from iotests import log, qemu_img, qemu_io_silent # Need backing file support -iotests.verify_image_format(supported_fmts=['qcow2', 'qcow', 'qed', 'vmdk']) -iotests.verify_platform(['linux']) +iotests.script_initialize(supported_fmts=['qcow2', 'qcow', 'qed', 'vmdk']) log('') log('=== Copy-on-read across nodes ===') diff --git a/tests/qemu-iotests/218 b/tests/qemu-iotests/218 index 2554d84581..e18e31076b 100755 --- a/tests/qemu-iotests/218 +++ b/tests/qemu-iotests/218 @@ -29,7 +29,7 @@ import iotests from iotests import log, qemu_img, qemu_io_silent -iotests.verify_image_format(supported_fmts=['qcow2', 'raw']) +iotests.script_initialize(supported_fmts=['qcow2', 'raw']) # Launches the VM, adds two null-co nodes (source and target), and diff --git a/tests/qemu-iotests/219 b/tests/qemu-iotests/219 index e0c51662c0..9ae27cb04e 100755 --- a/tests/qemu-iotests/219 +++ b/tests/qemu-iotests/219 @@ -21,7 +21,7 @@ import iotests -iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.script_initialize(supported_fmts=['qcow2']) img_size = 4 * 1024 * 1024 diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222 index 0ead56d574..6788979ed3 100644 --- a/tests/qemu-iotests/222 +++ b/tests/qemu-iotests/222 @@ -24,9 +24,8 @@ import iotests from iotests import log, qemu_img, qemu_io, qemu_io_silent -iotests.verify_platform(['linux']) -iotests.verify_image_format(supported_fmts=['qcow2', 'qcow', 'qed', 'vmdk', - 'vhdx', 'raw']) +iotests.script_initialize(supported_fmts=['qcow2', 'qcow', 'qed', 'vmdk', + 'vhdx', 'raw']) patterns = [("0x5d", "0", "64k"), ("0xd5", "1M", "64k"), diff --git a/tests/qemu-iotests/224 b/tests/qemu-iotests/224 index b4dfaa639f..d0d0c44104 100755 --- a/tests/qemu-iotests/224 +++ b/tests/qemu-iotests/224 @@ -26,8 +26,7 @@ from iotests import log, qemu_img, qemu_io_silent, filter_qmp_testfiles, \ import json # Need backing file support (for arbitrary backing formats) -iotests.verify_image_format(supported_fmts=['qcow2', 'qcow', 'qed']) -iotests.verify_platform(['linux']) +iotests.script_initialize(supported_fmts=['qcow2', 'qcow', 'qed']) # There are two variations of this test: diff --git a/tests/qemu-iotests/228 b/tests/qemu-iotests/228 index 9a50afd205..9785868ab3 100755 --- a/tests/qemu-iotests/228 +++ b/tests/qemu-iotests/228 @@ -25,8 +25,7 @@ from iotests import log, qemu_img, filter_testfiles, filter_imgfmt, \ filter_qmp_testfiles, filter_qmp_imgfmt # Need backing file and change-backing-file support -iotests.verify_image_format(supported_fmts=['qcow2', 'qed']) -iotests.verify_platform(['linux']) +iotests.script_initialize(supported_fmts=['qcow2', 'qed']) def log_node_info(node): diff --git a/tests/qemu-iotests/234 b/tests/qemu-iotests/234 index 34c818c485..3de6ab2341 100755 --- a/tests/qemu-iotests/234 +++ b/tests/qemu-iotests/234 @@ -23,8 +23,7 @@ import iotests import os -iotests.verify_image_format(supported_fmts=['qcow2']) -iotests.verify_platform(['linux']) +iotests.script_initialize(supported_fmts=['qcow2']) with iotests.FilePath('img') as img_path, \ iotests.FilePath('backing') as backing_path, \ diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235 index fedd111fd4..9e88c65b93 100755 --- a/tests/qemu-iotests/235 +++ b/tests/qemu-iotests/235 @@ -27,6 +27,8 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from qemu.machine import QEMUMachine +iotests.script_initialize(supported_fmts=['qcow2']) + # Note: # This test was added to check that mirror dead-lock was fixed (see previous # commit before this test addition). @@ -40,8 +42,6 @@ from qemu.machine import QEMUMachine size = 1 * 1024 * 1024 * 1024 -iotests.verify_image_format(supported_fmts=['qcow2']) - disk = file_path('disk') # prepare source image diff --git a/tests/qemu-iotests/236 b/tests/qemu-iotests/236 index 79a6381f8e..b88779eb0b 100755 --- a/tests/qemu-iotests/236 +++ b/tests/qemu-iotests/236 @@ -22,7 +22,7 @@ import iotests from iotests import log -iotests.verify_image_format(supported_fmts=['generic']) +iotests.script_initialize(supported_fmts=['generic']) size = 64 * 1024 * 1024 granularity = 64 * 1024 diff --git a/tests/qemu-iotests/237 b/tests/qemu-iotests/237 index 06897f8c87..3758ace0bc 100755 --- a/tests/qemu-iotests/237 +++ b/tests/qemu-iotests/237 @@ -24,7 +24,7 @@ import math import iotests from iotests import imgfmt -iotests.verify_image_format(supported_fmts=['vmdk']) +iotests.script_initialize(supported_fmts=['vmdk']) def blockdev_create(vm, options): result = vm.qmp_log('blockdev-create', job_id='job0', options=options, diff --git a/tests/qemu-iotests/238 b/tests/qemu-iotests/238 index e5ac2b2ff8..6e27fb40c2 100755 --- a/tests/qemu-iotests/238 +++ b/tests/qemu-iotests/238 @@ -23,6 +23,8 @@ import os import iotests from iotests import log +iotests.script_initialize() + virtio_scsi_device = iotests.get_virtio_scsi_device() vm = iotests.VM() diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242 index c176e92da6..7c2685b4cc 100755 --- a/tests/qemu-iotests/242 +++ b/tests/qemu-iotests/242 @@ -24,7 +24,7 @@ import struct from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \ file_path, img_info_log, log, filter_qemu_io -iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.script_initialize(supported_fmts=['qcow2']) disk = file_path('disk') chunk = 256 * 1024 diff --git a/tests/qemu-iotests/246 b/tests/qemu-iotests/246 index b0997a392f..1d7747d62d 100755 --- a/tests/qemu-iotests/246 +++ b/tests/qemu-iotests/246 @@ -22,7 +22,7 @@ import iotests from iotests import log -iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.script_initialize(supported_fmts=['qcow2']) size = 64 * 1024 * 1024 * 1024 gran_small = 32 * 1024 gran_large = 128 * 1024 diff --git a/tests/qemu-iotests/248 b/tests/qemu-iotests/248 index f26b4bb2aa..781b21b227 100755 --- a/tests/qemu-iotests/248 +++ b/tests/qemu-iotests/248 @@ -21,7 +21,7 @@ import iotests from iotests import qemu_img_create, qemu_io, file_path, filter_qmp_testfiles -iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.script_initialize(supported_fmts=['qcow2']) source, target = file_path('source', 'target') size = 5 * 1024 * 1024 diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254 index 09584f3f7d..43b40f4f71 100755 --- a/tests/qemu-iotests/254 +++ b/tests/qemu-iotests/254 @@ -21,7 +21,7 @@ import iotests from iotests import qemu_img_create, file_path, log -iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.script_initialize(supported_fmts=['qcow2']) disk, top = file_path('disk', 'top') size = 1024 * 1024 diff --git a/tests/qemu-iotests/255 b/tests/qemu-iotests/255 index 3632d507d0..ff16402268 100755 --- a/tests/qemu-iotests/255 +++ b/tests/qemu-iotests/255 @@ -23,7 +23,7 @@ import iotests from iotests import imgfmt -iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.script_initialize(supported_fmts=['qcow2']) def blockdev_create(vm, options): result = vm.qmp_log('blockdev-create', diff --git a/tests/qemu-iotests/256 b/tests/qemu-iotests/256 index c594a43205..d2f9212e5a 100755 --- a/tests/qemu-iotests/256 +++ b/tests/qemu-iotests/256 @@ -23,7 +23,7 @@ import os import iotests from iotests import log -iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.script_initialize(supported_fmts=['qcow2']) size = 64 * 1024 * 1024 with iotests.FilePath('img0') as img0_path, \ diff --git a/tests/qemu-iotests/262 b/tests/qemu-iotests/262 index 398f63587e..f0e9d0f8ac 100755 --- a/tests/qemu-iotests/262 +++ b/tests/qemu-iotests/262 @@ -23,8 +23,7 @@ import iotests import os -iotests.verify_image_format(supported_fmts=['qcow2']) -iotests.verify_platform(['linux']) +iotests.script_initialize(supported_fmts=['qcow2']) with iotests.FilePath('img') as img_path, \ iotests.FilePath('mig_fifo') as fifo, \ diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index b26271187c..92117a64bc 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -895,7 +895,20 @@ def skip_if_unsupported(required_formats=[], read_only=False): return func_wrapper return skip_test_decorator -def execute_unittest(output, verbosity, debug): +def execute_unittest(debug=False): + """Executes unittests within the calling module.""" + + verbosity = 2 if debug else 1 + + if debug: + output = sys.stdout + elif sys.version_info.major >= 3: + output = io.StringIO() + else: + # io.StringIO is for unicode strings, which is not what + # 2.x's test runner emits. + output = io.BytesIO() + runner = unittest.TextTestRunner(stream=output, descriptions=True, verbosity=verbosity) try: @@ -903,15 +916,21 @@ def execute_unittest(output, verbosity, debug): # exception unittest.main(testRunner=runner) finally: + # We need to filter out the time taken from the output so that + # qemu-iotest can reliably diff the results against master output. if not debug: sys.stderr.write(re.sub(r'Ran (\d+) tests? in [\d.]+s', r'Ran \1 tests', output.getvalue())) -def execute_test(test_function=None, - supported_fmts=[], supported_oses=['linux'], - supported_cache_modes=[], unsupported_fmts=[], - supported_protocols=[], unsupported_protocols=[]): - """Run either unittest or script-style tests.""" +def execute_setup_common(supported_fmts=[], + supported_oses=['linux'], + supported_cache_modes=[], + unsupported_fmts=[], + supported_protocols=[], + unsupported_protocols=[]): + """ + Perform necessary setup for either script-style or unittest-style tests. + """ # We are using TEST_DIR and QEMU_DEFAULT_MACHINE as proxies to # indicate that we're not being run via "check". There may be @@ -921,38 +940,38 @@ def execute_test(test_function=None, sys.stderr.write('Please run this test via the "check" script\n') sys.exit(os.EX_USAGE) - debug = '-d' in sys.argv - verbosity = 1 verify_image_format(supported_fmts, unsupported_fmts) verify_protocol(supported_protocols, unsupported_protocols) verify_platform(supported_oses) verify_cache_mode(supported_cache_modes) + debug = '-d' in sys.argv if debug: - output = sys.stdout - verbosity = 2 sys.argv.remove('-d') - else: - # We need to filter out the time taken from the output so that - # qemu-iotest can reliably diff the results against master output. - if sys.version_info.major >= 3: - output = io.StringIO() - else: - # io.StringIO is for unicode strings, which is not what - # 2.x's test runner emits. - output = io.BytesIO() - logging.basicConfig(level=(logging.DEBUG if debug else logging.WARN)) + return debug + +def execute_test(test_function=None, *args, **kwargs): + """Run either unittest or script-style tests.""" + + debug = execute_setup_common(*args, **kwargs) if not test_function: - execute_unittest(output, verbosity, debug) + execute_unittest(debug) else: test_function() +# This is called from script-style iotests without a single point of entry +def script_initialize(*args, **kwargs): + """Initialize script-style tests without running any tests.""" + execute_setup_common(*args, **kwargs) + +# This is called from script-style iotests with a single point of entry def script_main(test_function, *args, **kwargs): """Run script-style tests outside of the unittest framework""" execute_test(test_function, *args, **kwargs) +# This is called from unittest style iotests def main(*args, **kwargs): """Run tests using the unittest framework""" execute_test(None, *args, **kwargs)
Like script_main, but doesn't require a single point of entry. Replace all existing initialization sections with this drop-in replacement. This brings debug support to all existing script-style iotests. Note: supported_oses=['linux'] was omitted, as it is a default argument. Signed-off-by: John Snow <jsnow@redhat.com> --- tests/qemu-iotests/149 | 3 +- tests/qemu-iotests/194 | 3 +- tests/qemu-iotests/202 | 3 +- tests/qemu-iotests/203 | 3 +- tests/qemu-iotests/206 | 2 +- tests/qemu-iotests/207 | 2 +- tests/qemu-iotests/208 | 2 +- tests/qemu-iotests/209 | 2 +- tests/qemu-iotests/210 | 2 +- tests/qemu-iotests/211 | 2 +- tests/qemu-iotests/212 | 2 +- tests/qemu-iotests/213 | 2 +- tests/qemu-iotests/216 | 3 +- tests/qemu-iotests/218 | 2 +- tests/qemu-iotests/219 | 2 +- tests/qemu-iotests/222 | 5 ++- tests/qemu-iotests/224 | 3 +- tests/qemu-iotests/228 | 3 +- tests/qemu-iotests/234 | 3 +- tests/qemu-iotests/235 | 4 +-- tests/qemu-iotests/236 | 2 +- tests/qemu-iotests/237 | 2 +- tests/qemu-iotests/238 | 2 ++ tests/qemu-iotests/242 | 2 +- tests/qemu-iotests/246 | 2 +- tests/qemu-iotests/248 | 2 +- tests/qemu-iotests/254 | 2 +- tests/qemu-iotests/255 | 2 +- tests/qemu-iotests/256 | 2 +- tests/qemu-iotests/262 | 3 +- tests/qemu-iotests/iotests.py | 61 +++++++++++++++++++++++------------ 31 files changed, 73 insertions(+), 62 deletions(-)