api: remove setup_stdio

API.setup_stdio was replaced in PRs 506 and 507,
remove setup_stdio functions and call sites.

test/mod/test_buildroot.py

@@ -8,7 +8,6 @@ import sys
 import tempfile
 import unittest
 
-import osbuild
 from osbuild.buildroot import BuildRoot
 from osbuild.monitor import LogMonitor, NullMonitor
 from .. import test
@@ -24,9 +23,6 @@ class TestBuildRoot(test.TestBase):
         self.tmp.cleanup()
 
     def test_basic(self):
-        # This also checks the API and BuildRoot integration:
-        # the runner will call api.setup_stdio and thus check
-        # that connecting to the api works correctly
         runner = "org.osbuild.linux"
         libdir = os.path.abspath(os.curdir)
         var = pathlib.Path(self.tmp.name, "var")
@@ -34,8 +30,6 @@ class TestBuildRoot(test.TestBase):
 
         monitor = NullMonitor(sys.stderr.fileno())
         with BuildRoot("/", runner, libdir=libdir, var=var) as root:
-            api = osbuild.api.API({}, monitor)
-            root.register_api(api)
 
             r = root.run(["/usr/bin/true"], monitor)
             self.assertEqual(r.returncode, 0)
@@ -59,8 +53,6 @@ class TestBuildRoot(test.TestBase):
              open(logfile, "w") as log:
 
             monitor = LogMonitor(log.fileno())
-            api = osbuild.api.API({}, monitor)
-            root.register_api(api)
 
             r = root.run(["/usr/bin/true"], monitor)
 
@@ -81,8 +73,6 @@ class TestBuildRoot(test.TestBase):
 
         monitor = NullMonitor(sys.stderr.fileno())
         with BuildRoot("/", runner, libdir=libdir, var=var) as root:
-            api = osbuild.api.API({}, monitor)
-            root.register_api(api)
 
             r = root.run(["/usr/bin/echo", data], monitor)
             self.assertEqual(r.returncode, 0)
@@ -103,8 +93,6 @@ class TestBuildRoot(test.TestBase):
 
         monitor = NullMonitor(sys.stderr.fileno())
         with BuildRoot("/", runner, libdir=libdir, var=var) as root:
-            api = osbuild.api.API({}, monitor)
-            root.register_api(api)
 
             ro_binds = [f"{scripts}:/scripts"]
 
@@ -139,8 +127,6 @@ class TestBuildRoot(test.TestBase):
 
         monitor = NullMonitor(sys.stderr.fileno())
         with BuildRoot("/", runner, libdir=libdir, var=var) as root:
-            api = osbuild.api.API({}, monitor)
-            root.register_api(api)
 
             ro_binds = [f"{scripts}:/scripts"]
 

test/mod/test_monitor.py

@@ -3,9 +3,7 @@
 #
 
 import io
-import json
 import os
-import multiprocessing as mp
 import sys
 import tempfile
 import unittest
@@ -13,24 +11,10 @@ from collections import defaultdict
 
 import osbuild
 import osbuild.meta
-from osbuild.api import API
 from osbuild.monitor import LogMonitor
 from .. import test
 
 
-def echo(path):
-    """echo stdin to stdout after setting stdio up via API
-
-    Meant to be called as the main function in a process
-    simulating an osbuild runner and a stage run which does
-    nothing but returns the supplied options to stdout again.
-    """
-    osbuild.api.setup_stdio(path)
-    data = json.load(sys.stdin)
-    json.dump(data, sys.stdout)
-    sys.exit(0)
-
-
 class TapeMonitor(osbuild.monitor.BaseMonitor):
     """Record the usage of all called functions"""
     def __init__(self):
@@ -66,28 +50,6 @@ class TapeMonitor(osbuild.monitor.BaseMonitor):
 
 
 class TestMonitor(unittest.TestCase):
-    def test_log_monitor_api(self):
-        # Basic log and API integration check
-        with tempfile.TemporaryDirectory() as tmpdir:
-            args = {"foo": "bar"}
-            path = os.path.join(tmpdir, "osbuild-api")
-            logfile = os.path.join(tmpdir, "log.txt")
-
-            with open(logfile, "w") as log:
-                api = API(args, LogMonitor(log.fileno()), socket_address=path)
-                with api as api:
-                    p = mp.Process(target=echo, args=(path, ))
-                    p.start()
-                    p.join()
-                    self.assertEqual(p.exitcode, 0)
-                output = api.output  # pylint: disable=no-member
-                assert output
-
-            self.assertEqual(json.dumps(args), output)
-            with open(logfile) as f:
-                log = f.read()
-            self.assertEqual(log, output)
-
     @unittest.skipUnless(test.TestBase.can_bind_mount(), "root-only")
     def test_log_monitor_vfuncs(self):
         # Checks the basic functioning of the LogMonitor