zmake: remove unit tests that were moved to platform/ec
This change deletes the python unit tests for zmake that now exist in
platform/ec.
BUG=b:177003034
TEST=zmake -l INFO testall (see that these tests are still run in
platform/ec)
Change-Id: I041ae130838446b65d434c8d3ac96a83cc594710
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/zephyr-chrome/+/2623749
Tested-by: Yuval Peress <peress@chromium.org>
Auto-Submit: Yuval Peress <peress@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
diff --git a/tests/util/zmake/test_multiproc_executor.py b/tests/util/zmake/test_multiproc_executor.py
deleted file mode 100644
index aa839bc..0000000
--- a/tests/util/zmake/test_multiproc_executor.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2020 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 threading
-
-import zmake.multiproc
-
-
-def test_single_function_executor_success():
- executor = zmake.multiproc.Executor(fail_fast=True)
- executor.append(lambda: 0)
- assert executor.wait() == 0
-
- executor = zmake.multiproc.Executor(fail_fast=False)
- executor.append(lambda: 0)
- assert executor.wait() == 0
-
-
-def test_single_function_executor_fail():
- executor = zmake.multiproc.Executor(fail_fast=True)
- executor.append(lambda: -1)
- assert executor.wait() == -1
-
- executor = zmake.multiproc.Executor(fail_fast=False)
- executor.append(lambda: -2)
- assert executor.wait() == -2
-
-
-def test_single_function_executor_raise():
- executor = zmake.multiproc.Executor(fail_fast=True)
- executor.append(lambda: 1/0)
- assert executor.wait() != 0
-
- executor = zmake.multiproc.Executor(fail_fast=False)
- executor.append(lambda: 1/0)
- assert executor.wait() != 0
-
-
-def _lock_step(cv, predicate, step, return_value=0):
- with cv:
- cv.wait_for(predicate=lambda: step[0] == predicate)
- step[0] += 1
- cv.notify_all()
- return return_value
-
-
-def test_two_function_executor_wait_for_both():
- cv = threading.Condition()
- step = [0]
- executor = zmake.multiproc.Executor(fail_fast=True)
- executor.append(lambda: _lock_step(cv=cv, predicate=0, step=step))
- executor.append(lambda: _lock_step(cv=cv, predicate=1, step=step))
- assert executor.wait() == 0
- assert step[0] == 2
-
- step = [0]
- executor = zmake.multiproc.Executor(fail_fast=False)
- executor.append(lambda: _lock_step(cv=cv, predicate=0, step=step))
- executor.append(lambda: _lock_step(cv=cv, predicate=1, step=step))
- assert executor.wait() == 0
- assert step[0] == 2
-
-
-def test_two_function_executor_one_fails():
- cv = threading.Condition()
- step = [0]
- executor = zmake.multiproc.Executor(fail_fast=True)
- executor.append(lambda: _lock_step(cv=cv, predicate=0, step=step, return_value=-1))
- executor.append(lambda: _lock_step(cv=cv, predicate=2, step=step))
- assert executor.wait() == -1
- assert step[0] == 1
-
- step = [0]
- executor = zmake.multiproc.Executor(fail_fast=False)
- executor.append(lambda: _lock_step(cv=cv, predicate=0, step=step, return_value=-1))
- executor.append(lambda: _lock_step(cv=cv, predicate=1, step=step))
- assert executor.wait() == -1
- assert step[0] == 2
diff --git a/tests/util/zmake/test_multiproc_logging.py b/tests/util/zmake/test_multiproc_logging.py
deleted file mode 100644
index 73aad23..0000000
--- a/tests/util/zmake/test_multiproc_logging.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2020 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 unittest.mock as mock
-import threading
-
-import zmake.multiproc
-
-
-def test_read_output_from_pipe():
- barrier = threading.Barrier(2)
- 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: barrier.wait()
- zmake.multiproc.log_output(logger, logging.DEBUG, fd)
- os.write(pipe[1], 'Hello\n'.encode('utf-8'))
- barrier.wait()
- logger.log.assert_called_with(logging.DEBUG, 'Hello')
-
-
-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.
- """
- barrier = threading.Barrier(2)
- 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, line: barrier.wait()
-
- zmake.multiproc.log_output(logger, logging.DEBUG, fds[0])
- zmake.multiproc.log_output(logger, logging.ERROR, fds[1])
-
- os.write(pipes[1][1], 'Hello\n'.encode('utf-8'))
- barrier.wait()
- logger.log.assert_called_with(logging.ERROR, '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.
- """
- barrier = threading.Barrier(2)
- 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, line: barrier.wait()
-
- zmake.multiproc.log_output(logger, logging.DEBUG, fds[0])
- zmake.multiproc.log_output(logger, logging.ERROR, fds[1])
-
- fds[0].close()
- os.write(pipes[1][1], 'Hello\n'.encode('utf-8'))
- barrier.wait()
- logger.log.assert_called_with(logging.ERROR, 'Hello')
