virtinst: Drop unused stable_defaults field

This commit is contained in:
Cole Robinson 2015-03-23 16:17:07 -04:00
parent 7a1b7b69e3
commit 8220e4c60f
2 changed files with 1 additions and 7 deletions

View File

@ -24,9 +24,6 @@ os.environ["VIRTINST_TEST_SUITE"] = "1"
os.environ["VIRTINST_TEST_URL_DIR"] = os.path.abspath(
"tests/cli-test-xml/fakefedoratree/")
import virtinst
virtinst.stable_defaults = False
from virtcli import cliconfig
# This sets all the cli bits back to their defaults
reload(cliconfig)
@ -37,6 +34,7 @@ from tests import utils
# Access to protected member, needed to unittest stuff
# Force certain helpers to return consistent values
import virtinst
virtinst.util.is_blktap_capable = lambda ignore: False
virtinst.util.default_bridge = lambda ignore1: "eth0"

View File

@ -296,7 +296,6 @@ class TestXMLMisc(unittest.TestCase):
self._compare(g, "install-f11-norheldefaults", do_install)
try:
virtinst.stable_defaults = True
cliconfig.stable_defaults = True
origemu = g.emulator
g.emulator = "/usr/libexec/qemu-kvm"
@ -306,7 +305,6 @@ class TestXMLMisc(unittest.TestCase):
setattr(g.conn, "_support_cache", {})
finally:
cliconfig.stable_defaults = False
virtinst.stable_defaults = False
# Verify main guest wasn't polluted
self._compare(g, "install-f11-norheldefaults", do_install)
@ -318,7 +316,6 @@ class TestXMLMisc(unittest.TestCase):
g = _make_guest(conn=conn)
try:
virtinst.stable_defaults = True
cliconfig.stable_defaults = True
g.emulator = "/usr/libexec/qemu-kvm"
g.add_default_video_device()
@ -328,4 +325,3 @@ class TestXMLMisc(unittest.TestCase):
self._compare(g, "install-novmvga-rhel", True)
finally:
cliconfig.stable_defaults = False
virtinst.stable_defaults = False