| Message ID | 20200430095249.782597-10-thomas.petazzoni@bootlin.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Overwritten file detection, improvements to file listing logic | expand |
Thomas, All, Some pythonery below... On 2020-04-30 11:52 +0200, Thomas Petazzoni spake thusly: > Some tests will need to grep through the build log to verify that some > features are working are expected. In order to allow them to open the > build log, we provide a new function called log_file_path(), which > returns the path to the log file if available. > > We also use this function in open_log_file(). > > Note that open_log_file() cannot be used directly to grep through the > log file at the end of a build: because it opens in "a+" mode, it > greps starting from the end of the file. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > --- > support/testing/infra/__init__.py | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/support/testing/infra/__init__.py b/support/testing/infra/__init__.py > index 6392aa679b..aaee055ee6 100644 > --- a/support/testing/infra/__init__.py > +++ b/support/testing/infra/__init__.py > @@ -10,14 +10,23 @@ ARTIFACTS_URL = "http://autobuild.buildroot.net/artefacts/" > BASE_DIR = os.path.realpath(os.path.join(os.path.dirname(__file__), "../../..")) > > > +def log_file_path(builddir, stage, logtofile=True): > + """Return path to log file""" > + if logtofile: > + return "{}-{}.log".format(builddir, stage) > + else: > + return None def log_file_path(builddir, stage, logtofile=True): """ blabla """ return "{}-{}.log".format(builddir, stage) if logtofile else None > def open_log_file(builddir, stage, logtofile=True): > """ > Open a file for logging and return its handler. > If logtofile is True, returns sys.stdout. Otherwise opens a file > with a suitable name in the build directory. > """ > - if logtofile: > - fhandle = open("{}-{}.log".format(builddir, stage), 'a+') > + logf = log_file_path(builddir, stage, logtofile) > + if logf: > + fhandle = open(logf, 'a+') > else: > fhandle = sys.stdout > return fhandle def open_log_file(builddir, stage, logtofile=True): """ blabla """ return open(log_file_path(builddir, stage, logtofile), 'a+') if logtofile else sys.stdout Regards, Yann E. MORIN. > -- > 2.25.4 >
diff --git a/support/testing/infra/__init__.py b/support/testing/infra/__init__.py index 6392aa679b..aaee055ee6 100644 --- a/support/testing/infra/__init__.py +++ b/support/testing/infra/__init__.py @@ -10,14 +10,23 @@ ARTIFACTS_URL = "http://autobuild.buildroot.net/artefacts/" BASE_DIR = os.path.realpath(os.path.join(os.path.dirname(__file__), "../../..")) +def log_file_path(builddir, stage, logtofile=True): + """Return path to log file""" + if logtofile: + return "{}-{}.log".format(builddir, stage) + else: + return None + + def open_log_file(builddir, stage, logtofile=True): """ Open a file for logging and return its handler. If logtofile is True, returns sys.stdout. Otherwise opens a file with a suitable name in the build directory. """ - if logtofile: - fhandle = open("{}-{}.log".format(builddir, stage), 'a+') + logf = log_file_path(builddir, stage, logtofile) + if logf: + fhandle = open(logf, 'a+') else: fhandle = sys.stdout return fhandle
Some tests will need to grep through the build log to verify that some features are working are expected. In order to allow them to open the build log, we provide a new function called log_file_path(), which returns the path to the log file if available. We also use this function in open_log_file(). Note that open_log_file() cannot be used directly to grep through the log file at the end of a build: because it opens in "a+" mode, it greps starting from the end of the file. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- support/testing/infra/__init__.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)