Merge pull request #226 from stkw0/dev

fix --with-vnc option

Author: stkw0

ebuildtester/docker.py

@@ -343,6 +343,11 @@ def _install_basics(self):
             self.execute("emerge --verbose %s" %
                          " ".join(map(str, options.base_packages)))
 
+        if options.OPTIONS.with_vnc:
+            t = ["net-misc/tigervnc", "x11-wm/icewm"]
+            options.log.info("installing VNC packages: %s" % t)
+            self.execute("emerge --verbose %s" % " ".join(map(str, t)))
+
     def _enable_global_use(self):
         """Enable global USE settings."""
         if not options.OPTIONS.global_use:

ebuildtester/parse.py

@@ -178,9 +178,6 @@ def parse_commandline(args):
     if options.ccache:
         options.features.append("ccache")
 
-    if options.with_vnc:
-        options.atom += ["net-misc/tigervnc", "x11-wm/icewm"]
-
     options.atom = list(map(Atom, options.atom))
 
     if options.update in ["yes", "true"]:

test/test_parse.py

@@ -80,13 +80,6 @@ def test_python_targets(self):
             self.args + ["--manual", "--python-targets", "python3_8"])
         self.assertEqual("python3_8", options.python_targets)
 
-    def test_with_vnc(self):
-        options = ebuildtester.parse.parse_commandline(
-            self.args + ["--manual", "--with-vnc"])
-        self.assertTrue(options.with_vnc)
-        self.assertTrue(Atom("net-misc/tigervnc") in options.atom)
-        self.assertTrue(Atom("x11-wm/icewm") in options.atom)
-
     def test_docker_image(self):
         options = ebuildtester.parse.parse_commandline(
             self.args + ["--manual"])