tests: Make sure virtinst doesn't pull in Gtk

Add an explicit test to warn if it inadvertently happens

tests/misc.py

@@ -0,0 +1,90 @@
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free  Software Foundation; either version 2 of the License, or
+# (at your option)  any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA.
+
+import fnmatch
+import imp
+import importlib
+import os
+import sys
+import unittest
+
+_badmodules = ["gi.repository.Gtk", "gi.repository.GObject",
+              "gi.repository.Gdk", "gi.repository.GLib"]
+
+
+def _restore_modules(fn):
+    def wrap(*args, **kwargs):
+        origimport = __builtins__["__import__"]
+        def my_import(name, *iargs, **ikwargs):
+            if name in _badmodules:
+                raise AssertionError("Tried to import '%s'" % name)
+            return origimport(name, *iargs, **ikwargs)
+
+        try:
+            __builtins__["__import__"] = my_import
+            return fn(*args, **kwargs)
+        finally:
+            __builtins__["__import__"] = origimport
+    return wrap
+
+
+def _find_py(dirname):
+    ret = []
+    for root, ignore, filenames in os.walk(dirname):
+        for filename in fnmatch.filter(filenames, "*.py"):
+            ret.append(os.path.join(root, filename))
+    ret.sort(key=lambda s: s.lower())
+    return ret
+
+
+class TestMisc(unittest.TestCase):
+    """
+    Miscellaneous tests
+    """
+    def _check_modules(self, files):
+        for f in files:
+            regular_import = f.endswith(".py")
+            if f.endswith("/__init__.py"):
+                f = f.rsplit("/", 1)[0]
+            name = f.rsplit(".", 1)[0].replace("/", ".")
+            if name in sys.modules:
+                continue
+
+            if regular_import:
+                importlib.import_module(name)
+            else:
+                imp.load_source(name, f)
+
+        found = []
+        for f in _badmodules:
+            if f in sys.modules:
+                found.append(f)
+
+        if found:
+            raise AssertionError("%s found in sys.modules" % found)
+
+
+    @_restore_modules
+    def test_no_gtk_virtinst(self):
+        """
+        Make sure virtinst doesn't pull in any gnome modules
+        """
+        files = ["virt-install", "virt-clone", "virt-convert", "virt-image"]
+        files += _find_py("virtinst")
+        files += _find_py("virtconv")
+        files += _find_py("virtcli")
+
+        self._check_modules(files)

virtconv/parsers/vmx.py

@@ -29,6 +29,7 @@ import os
 import logging
 import shlex
 
+
 _VMX_MAIN_TEMPLATE = """
 #!/usr/bin/vmplayer