mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-01 17:35:17 +00:00
tests: remove use of virTestOOMActive from bhyve testsuite
The virTestOOMActive method was deleted in commit 2c52ecd96086b4643b99b4570b5823d40ce2787b Author: Daniel P. Berrangé <berrange@redhat.com> Date: Thu Aug 29 13:04:07 2019 +0100 util: purge all code for testing OOM handling Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
b9ed82c9fb
commit
3eca0e300d
@ -39,19 +39,18 @@ testCompareXMLToArgvFiles(const char *xmlfile,
|
||||
|
||||
if (!(vmdef = bhyveParseCommandLineString(cmd, driver.bhyvecaps,
|
||||
driver.xmlopt))) {
|
||||
if ((flags & FLAG_EXPECT_FAILURE) && !virTestOOMActive()) {
|
||||
if ((flags & FLAG_EXPECT_FAILURE)) {
|
||||
VIR_TEST_DEBUG("Got expected failure from "
|
||||
"bhyveParseCommandLineString.");
|
||||
} else {
|
||||
goto fail;
|
||||
}
|
||||
} else if ((flags & FLAG_EXPECT_FAILURE) && !virTestOOMActive()) {
|
||||
} else if ((flags & FLAG_EXPECT_FAILURE)) {
|
||||
VIR_TEST_DEBUG("Did not get expected failure from "
|
||||
"bhyveParseCommandLineString.");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (!virTestOOMActive()) {
|
||||
if ((log = virTestLogContentAndReset()) == NULL)
|
||||
goto fail;
|
||||
if (flags & FLAG_EXPECT_WARNING) {
|
||||
@ -72,7 +71,6 @@ testCompareXMLToArgvFiles(const char *xmlfile,
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (vmdef && !virDomainDefCheckABIStability(vmdef, vmdef, driver.xmlopt)) {
|
||||
VIR_TEST_DEBUG("ABI stability check failed on %s", xmlfile);
|
||||
|
Loading…
x
Reference in New Issue
Block a user