ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 106 deletions

diff --git a/zephyr/zmake/tests/test_multiproc_logging.py b/zephyr/zmake/tests/test_multiproc_logging.py
deleted file mode 100644
index 2eac9326d3..0000000000
--- a/zephyr/zmake/tests/test_multiproc_logging.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-import io
-import logging
-import os
-import threading
-import unittest.mock as mock
-
-import zmake.multiproc
-
-
-def test_read_output_from_pipe():
-    semaphore = threading.Semaphore(0)
-    pipe = os.pipe()
-    fd = io.TextIOWrapper(os.fdopen(pipe[0], "rb"), encoding="utf-8")
-    logger = mock.Mock(spec=logging.Logger)
-    logger.log.side_effect = lambda log_lvl, line: semaphore.release()
-    zmake.multiproc.log_output(logger, logging.DEBUG, fd, job_id="")
-    os.write(pipe[1], "Hello\n".encode("utf-8"))
-    semaphore.acquire()
-    logger.log.assert_called_with(logging.DEBUG, "Hello")
-
-
-def test_read_output_change_log_level():
-    semaphore = threading.Semaphore(0)
-    pipe = os.pipe()
-    fd = io.TextIOWrapper(os.fdopen(pipe[0], "rb"), encoding="utf-8")
-    logger = mock.Mock(spec=logging.Logger)
-    logger.log.side_effect = lambda log_lvl, line: semaphore.release()
-    # This call will log output from fd (the file descriptor) to DEBUG, though
-    # when the line starts with 'World', the logging level will be switched to
-    # CRITICAL (see the content of the log_lvl_override_func).
-    zmake.multiproc.log_output(
-        logger=logger,
-        log_level=logging.DEBUG,
-        file_descriptor=fd,
-        log_level_override_func=lambda line, lvl: logging.CRITICAL
-        if line.startswith("World")
-        else lvl,
-        job_id="",
-    )
-    os.write(pipe[1], "Hello\n".encode("utf-8"))
-    semaphore.acquire()
-    os.write(pipe[1], "World\n".encode("utf-8"))
-    semaphore.acquire()
-    os.write(pipe[1], "Bye\n".encode("utf-8"))
-    semaphore.acquire()
-    logger.log.assert_has_calls(
-        [
-            mock.call(logging.DEBUG, "Hello"),
-            mock.call(logging.CRITICAL, "World"),
-            mock.call(logging.CRITICAL, "Bye"),
-        ]
-    )
-
-
-def test_read_output_from_second_pipe():
-    """Test that we can read from more than one pipe.
-
-    This is particularly important since we will block on a read/select once we
-    have a file descriptor. It is important that we break from the select and
-    start it again with the updated list when a new one is added.
-    """
-    semaphore = threading.Semaphore(0)
-    pipes = [os.pipe(), os.pipe()]
-    fds = [
-        io.TextIOWrapper(os.fdopen(pipes[0][0], "rb"), encoding="utf-8"),
-        io.TextIOWrapper(os.fdopen(pipes[1][0], "rb"), encoding="utf-8"),
-    ]
-
-    logger = mock.Mock(spec=logging.Logger)
-    logger.log.side_effect = lambda log_lvl, fmt, id, line: semaphore.release()
-
-    zmake.multiproc.log_output(logger, logging.DEBUG, fds[0], job_id="0")
-    zmake.multiproc.log_output(logger, logging.ERROR, fds[1], job_id="1")
-
-    os.write(pipes[1][1], "Hello\n".encode("utf-8"))
-    semaphore.acquire()
-    logger.log.assert_called_with(logging.ERROR, "[%s]%s", "1", "Hello")
-
-
-def test_read_output_after_another_pipe_closed():
-    """Test processing output from a pipe after closing another.
-
-    Since we don't want to complicate the API. File descriptors are
-    automatically pruned away when closed. Make sure that the other descriptors
-    remain functional when that happens.
-    """
-    semaphore = threading.Semaphore(0)
-    pipes = [os.pipe(), os.pipe()]
-    fds = [
-        io.TextIOWrapper(os.fdopen(pipes[0][0], "rb"), encoding="utf-8"),
-        io.TextIOWrapper(os.fdopen(pipes[1][0], "rb"), encoding="utf-8"),
-    ]
-
-    logger = mock.Mock(spec=logging.Logger)
-    logger.log.side_effect = lambda log_lvl, fmt, id, line: semaphore.release()
-
-    zmake.multiproc.log_output(logger, logging.DEBUG, fds[0], job_id="0")
-    zmake.multiproc.log_output(logger, logging.ERROR, fds[1], job_id="1")
-
-    fds[0].close()
-    os.write(pipes[1][1], "Hello\n".encode("utf-8"))
-    semaphore.acquire()
-    logger.log.assert_called_with(logging.ERROR, "[%s]%s", "1", "Hello")