From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 9 Aug 2010 08:57:41 +0000 (-0700)
Subject: Call portage._disable_legacy_globals() in order to ensure that we
X-Git-Tag: v2.2_rc68~355
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aeaceebd2f4a93056533d3bb340bc2c55cd5a691;p=portage.git

Call portage._disable_legacy_globals() in order to ensure that we
don't instantiate portage.settings, so that tests should work the
same regardless of global configuration file state/existence.
---

diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests
index 8e8a3a443..a6f3b8f1c 100755
--- a/pym/portage/tests/runTests
+++ b/pym/portage/tests/runTests
@@ -10,6 +10,12 @@ import os.path as osp
 # This line courtesy of Marienz and Pkgcore ;)
 sys.path.insert(0, osp.dirname(osp.dirname(osp.dirname(osp.abspath(__file__)))))
 
+import portage
+
+# Ensure that we don't instantiate portage.settings, so that tests should
+# work the same regardless of global configuration file state/existence.
+portage._disable_legacy_globals()
+
 import portage.tests as tests
 from portage.const import PORTAGE_BIN_PATH
 path = os.environ.get("PATH", "").split(":")
@@ -19,6 +25,7 @@ if not path or not os.path.samefile(path[0], PORTAGE_BIN_PATH):
 	os.environ["PATH"] = ":".join(path)
 del path
 
+
 if __name__ == "__main__":
 	result = tests.main()
 	if not result.wasSuccessful():