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.

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

unit-tests: Switch stdio to non-blocking after invoking Node.js #9484

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions containers/unit-tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ RUN dpkg --add-architecture ${arch} && echo ${arch} > /arch && apt-get update &&
RUN npm install -g n && n stable && \
adduser --system --gecos "Builder" builder

# HACK: Working around Node.js screwing around with stdio
ENV NODE_PATH /usr/local/bin/nodejs
RUN mv /usr/local/bin/node /usr/local/bin/nodejs
ADD turd-polish /usr/local/bin/node

USER builder

VOLUME /source
Expand Down
41 changes: 41 additions & 0 deletions containers/unit-tests/turd-polish
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/usr/bin/python2

# Copyright (C) 2013 Red Hat, Inc.
#
# Cockpit is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# Cockpit is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with Cockpit; If not, see <http://www.gnu.org/licenses/>.

#
# This is certified, A-grade, high quality turd polish. Node leaves
# stdio file descriptors in non-blocking mode when exiting. This has
# been reported, fixed, unfixed, ad nauseum.
#
# https://github.com/nodejs/node/issues/14752
# https://github.com/nodejs/node/pull/17737
# https://github.com/nodejs/node/pull/20592
# https://github.com/nodejs/node/pull/21257
#
# It's starting to fester.
#

import fcntl
import os
import subprocess
import sys

assert "NODE_PATH" in os.environ
proc = subprocess.Popen([ os.environ["NODE_PATH"] ] + sys.argv[1:])
proc.wait()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine like that, just FYI: ret = subprocess.call([...])


map(lambda fd: fcntl.fcntl(fd, fcntl.F_SETFL, fcntl.fcntl(fd, fcntl.F_GETFL) &~ os.O_NONBLOCK), [0, 1, 2])
sys.exit(proc.returncode)