Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop output-check-record feature #5185

Merged
merged 5 commits into from
Dec 10, 2021
Merged

drop output-check-record feature #5185

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e76e17
config options: remove deprecated false boolean
beraldoleal Dec 8, 2021
beee20f
drop output-check-record feature
beraldoleal Dec 8, 2021
e5ce3bf
drop legacy runner code
beraldoleal Dec 8, 2021
f5ec057
utils.process: small refactoring
beraldoleal Dec 8, 2021
f1fe549
drop expected_files_merge plugin
beraldoleal Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
drop legacy runner code 
We are not supporting the legacy code at this point anymore. Let's drop
this portion of the code.

Signed-off-by: Beraldo Leal <bleal@redhat.com>
  • Loading branch information
@beraldoleal
beraldoleal committed Dec 9, 2021
commit e5ce3bf7e018c9a3f627bc1b7eb2cb6630aa3f8f
4 changes: 0 additions & 4 deletions avocado/plugins/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from avocado.core.plugin_interfaces import CLICmd, Init
from avocado.core.settings import settings
from avocado.core.suite import TestSuite, TestSuiteError
from avocado.utils import process


class RunInit(Init):
Expand Down Expand Up @@ -226,9 +225,6 @@ def run(self, config):
possibly other sources.
:type config: dict
"""
if config.get('run.test_runner') == 'runner':
process.NRUNNER_MODE = False

unique_job_id = config.get('run.unique_job_id')
if unique_job_id is not None:
try:
Expand Down
15 changes: 2 additions & 13 deletions avocado/utils/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@
#: undefined, this situation will be flagged by an exception.
UNDEFINED_BEHAVIOR_EXCEPTION = None

#: When using the nrunner architecture we don't need to log messages into the
#: stream_logger as well. By setting this to True, we will set stream_logger to
#: None.
NRUNNER_MODE = True

# variable=value bash assignment
_RE_BASH_SET_VARIABLE = re.compile(r"[a-zA-Z]\w*=.*")

Expand Down Expand Up @@ -642,19 +637,13 @@ def _init_subprocess(self):
self.start_time = time.monotonic() # pylint: disable=W0201

# prepare fd drainers
if NRUNNER_MODE:
stdout_stream_logger = None
stderr_stream_logger = None
else:
stdout_stream_logger = self.stdout_logger
stderr_stream_logger = self.stderr_logger
self._stdout_drainer = FDDrainer(
self._popen.stdout.fileno(),
self.result,
name="%s-stdout" % self.cmd,
logger=self.logger,
logger_prefix="[stdout] %s",
stream_logger=stdout_stream_logger,
stream_logger=None,
ignore_bg_processes=self._ignore_bg_processes,
verbose=self.verbose)
self._stderr_drainer = FDDrainer(
Expand All @@ -663,7 +652,7 @@ def _init_subprocess(self):
name="%s-stderr" % self.cmd,
logger=self.logger,
logger_prefix="[stderr] %s",
stream_logger=stderr_stream_logger,
stream_logger=None,
ignore_bg_processes=self._ignore_bg_processes,
verbose=self.verbose)

Expand Down