PR#1419: Remove buffering when running koji commands - pungi

pungi

#1419 Remove buffering when running koji commands

Merged 3 years ago by lsedlar. Opened 3 years ago by onosek.

onosek/pungi koji_buffering into master

Remove buffering when running koji commands

Ondrej Nosek • 3 years ago

d9f111e

pungi/wrappers/kojiwrapper.py

file modified

+7 -1

		`@@ -242,6 +242,9 @@`
		`@contextlib.contextmanager`
		`def get_koji_cmd_env(self):`
		`"""Get environment variables for running a koji command.`
		`+ Buffering is disabled - if the compose is aborted while koji tasks are`
		`+ running, we can be left with empty log files. That complicates`
		`+ debugging.`

		`If we are authenticated with a keytab, we need a fresh credentials`
		`cache to avoid possible race condition.`
		`@@ -250,9 +253,10 @@`
		`with util.temp_dir(prefix="krb_ccache") as tempdir:`
		`env = os.environ.copy()`
		`env["KRB5CCNAME"] = "DIR:%s" % tempdir`
		`+ env["PYTHONUNBUFFERED"] = "1"`
		`yield env`
		`else:`
		`- yield None`
		`+ yield {"PYTHONUNBUFFERED": "1"}`

		`def run_runroot_cmd(self, command, log_file=None):`
		`"""Run koji runroot command and wait for results.`
		`@@ -269,6 +273,7 @@`
		`logfile=log_file,`
		`show_cmd=True,`
		`env=env,`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`)`

		`@@ -510,6 +515,7 @@`
		`can_fail=True,`
		`logfile=log_file,`
		`env=env,`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`)`

tests/test_koji_wrapper.py

file modified

+34 -13

		`@@ -625,7 +625,8 @@`
		`mock.call(`
		`cmd,`
		`can_fail=True,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`logfile=None,`
		`show_cmd=True,`
		`universal_newlines=True,`
		`@@ -653,7 +654,8 @@`
		`mock.call(`
		`cmd,`
		`can_fail=True,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`logfile=None,`
		`show_cmd=True,`
		`universal_newlines=True,`
		`@@ -682,7 +684,12 @@`
		`mock.call(`
		`cmd,`
		`can_fail=True,`
		`- env={"KRB5CCNAME": "DIR:/tmp/foo", "FOO": "BAR"},`
		`+ env={`
		`+ "KRB5CCNAME": "DIR:/tmp/foo",`
		`+ "FOO": "BAR",`
		`+ "PYTHONUNBUFFERED": "1",`
		`+ },`
		`+ buffer_size=-1,`
		`logfile=None,`
		`show_cmd=True,`
		`universal_newlines=True,`
		`@@ -708,7 +715,8 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile=None,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`)`
		`],`
		`@@ -734,7 +742,12 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile=None,`
		`- env={"KRB5CCNAME": "DIR:/tmp/foo", "FOO": "BAR"},`
		`+ env={`
		`+ "KRB5CCNAME": "DIR:/tmp/foo",`
		`+ "FOO": "BAR",`
		`+ "PYTHONUNBUFFERED": "1",`
		`+ },`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`)`
		`],`
		`@@ -756,7 +769,8 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile="logfile",`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`)`
		`],`
		`@@ -778,7 +792,8 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile=None,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`)`
		`],`
		`@@ -800,7 +815,8 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile=None,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`)`
		`],`
		`@@ -823,7 +839,8 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile=None,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`),`
		`mock.call(`
		`@@ -851,7 +868,8 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile=None,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`),`
		`mock.call(`
		`@@ -880,7 +898,8 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile=None,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`),`
		`mock.call(`
		`@@ -922,7 +941,8 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile=None,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`),`
		`mock.call(`
		`@@ -957,7 +977,8 @@`
		`"cmd",`
		`can_fail=True,`
		`logfile=None,`
		`- env=None,`
		`+ env={"PYTHONUNBUFFERED": "1"},`
		`+ buffer_size=-1,`
		`universal_newlines=True,`
		`),`
		`mock.call(`