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

testbench: fix incompatibility of one omprog test with Python3 #3038

Merged
merged 1 commit into from Sep 22, 2018

Conversation

Projects
None yet
2 participants
@jsiwrk
Member

jsiwrk commented Sep 20, 2018

closes #3030

@jsiwrk

This comment has been minimized.

Member

jsiwrk commented Sep 20, 2018

Please do not merge yet (see comments in related issue).

testbench: fix incompatibility of one omprog test with Python3
Python3 writes to stderr immediately, and this caused the
captured output to differ with respect to Python2. Simplified
the test to do a single write to stderr. Also a cast to int
was needed when calculating 'numRepeats'.

closes #3030
@jsiwrk

This comment has been minimized.

Member

jsiwrk commented Sep 20, 2018

Ready to merge again.

@rgerhards rgerhards merged commit da22c53 into rsyslog:master Sep 22, 2018

27 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
LGTM analysis: C/C++ No alert changes
Details
LGTM analysis: JavaScript No alert changes
Details
LGTM analysis: Python No alert changes
Details
buildbot/rsyslog centos7-5 Build done.
Details
buildbot/rsyslog clang static analyzer Build done.
Details
buildbot/rsyslog codestyle check Build done.
Details
buildbot/rsyslog debian rsyslog Build done.
Details
buildbot/rsyslog debian9 rsyslog Build done.
Details
buildbot/rsyslog docker-arm-ubuntu18 Build done.
Details
buildbot/rsyslog docker-centos6 Build done.
Details
buildbot/rsyslog docker-centos7 rsyslog Build done.
Details
buildbot/rsyslog docker-debian8 Build done.
Details
buildbot/rsyslog docker-fedora28 Build done.
Details
buildbot/rsyslog docker-suse-tumbleweed Build done.
Details
buildbot/rsyslog docker-ubuntu16 rsyslog Build done.
Details
buildbot/rsyslog docker-ubuntu18-distcheck rsyslog Build done.
Details
buildbot/rsyslog docker-ubuntu18-san rsyslog Build done.
Details
buildbot/rsyslog freebsd rsyslog Build done.
Details
buildbot/rsyslog raspbian gcc compile Build done.
Details
buildbot/rsyslog raspbian rsyslog Build done.
Details
buildbot/rsyslog solaris10sparc rsyslog Build done.
Details
buildbot/rsyslog solaris10x64 rsyslog Build done.
Details
buildbot/rsyslog solaris11sparc rsyslog Build done.
Details
buildbot/rsyslog solaris11x64 rsyslog Build done.
Details
buildbot/rsyslog suse rsyslog Build done.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment