Merge pull request #105 from psklenar/avocado_logging

Avocado logging

Author: phracek

meta-test-family.spec

@@ -47,6 +47,7 @@ install -d -p -m 755 %{buildroot}%{_datadir}/%{framework_name}
 %{_bindir}/mtf-generator
 %{_bindir}/mtf-env-set
 %{_bindir}/mtf-env-clean
+%{_bindir}/mtf-log-parser
 %{python2_sitelib}/moduleframework/
 %{python2_sitelib}/meta_test_family-*.egg-info/
 %{_datadir}/moduleframework/

moduleframework/avocado_testers/avocado_test.py

@@ -62,6 +62,11 @@ def __init__(self, *args, **kwargs):
             "Module Type: %s - Backend: %s - Profile: %s" %
             (self.moduleType, self.moduleType_base, self.moduleProfile))
 
+    def __print_breaks(self, message):
+        delimiterStart = '\n::::::::::::::::::::::::'
+        delimiterEnd = '::::::::::::::::::::::::\n'
+        self.log.debug("\n{0} {1} {2}".format(delimiterStart, message, delimiterEnd))
+
     def cancel(self, *args, **kwargs):
         try:
             super(AvocadoTest, self).cancel(*args, **kwargs)
@@ -77,6 +82,7 @@ def setUp(self):
 
         :return: None
         """
+        self.__print_breaks("SETUP")
         return self.backend.setUp()
 
     def tearDown(self, *args, **kwargs):
@@ -88,6 +94,7 @@ def tearDown(self, *args, **kwargs):
 
         :return: None
         """
+        self.__print_breaks("TEARDOWN")
         return self.backend.tearDown(*args, **kwargs)
 
     def start(self, *args, **kwargs):
@@ -99,6 +106,7 @@ def start(self, *args, **kwargs):
         :param kwargs: Do not use it directly (It is defined in config.yaml)
         :return: None
         """
+        self.__print_breaks("START MODULE")
         return self.backend.start(*args, **kwargs)
 
     def stop(self, *args, **kwargs):
@@ -111,6 +119,7 @@ def stop(self, *args, **kwargs):
         :param kwargs: Do not use it directly (It is defined in config.yaml)
         :return: None
         """
+        self.__print_breaks("STOP")
         return self.backend.stop(*args, **kwargs)
 
     def run(self, *args, **kwargs):
@@ -121,6 +130,7 @@ def run(self, *args, **kwargs):
         :param kwargs: shell, ignore_status, verbose
         :return: object avocado.process.run
         """
+        self.__print_breaks("COMMAND IN MODULE <->")
         return self.backend.run(*args, **kwargs)
 
     def runCheckState(self, command="ls /", expected_state=0,
@@ -171,6 +181,7 @@ def runHost(self, *args, **kwargs):
         :param kwargs: pass thru
         :return: object of avocado.process.run
         """
+        self.__print_breaks("COMMAND ON HOST <!>")
         return self.backend.runHost(*args, **kwargs)
 
     def getModulemdYamlconfig(self, *args, **kwargs):

moduleframework/mtf_log_parser.py

@@ -0,0 +1,51 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Meta test family (MTF) is a tool to test components of a modular Fedora:
+# https://docs.pagure.org/modularity/
+# Copyright (C) 2017 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# he Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Authors: Petr Sklenar <[email protected]>
+#
+
+"""
+Utility for reading avocado json files.
+"""
+
+import sys
+import json
+
+def main():
+    try:
+        json_data=open(sys.argv[1]).read()
+        data = json.loads(json_data)
+    except (IOError, ValueError) as e:
+        # file is not readable as json: No JSON object could be decoded
+        print(e)
+        exit(1)
+    except:
+        print("no file: specify 1 argument as existing json file")
+        exit(3)
+    delimiter=""
+    for i in data['tests']:
+        if i.get('status') in ['ERROR','FAIL']:
+            print(delimiter)
+            print("TEST:   {0}".format(i.get('id')))
+            print("ERROR:  {0}".format(i.get('fail_reason')))
+            print("        {0}".format(i.get('logfile')))
+            delimiter = "-------------------------"
+

setup.py

@@ -80,6 +80,7 @@ def get_dir(system_path=None, virtual_path=None):
             'mtf-generator = moduleframework.mtf_generator:main',
             'mtf-env-set = moduleframework.mtf_environment:mtfenvset',
             'mtf-env-clean = moduleframework.mtf_environment:mtfenvclean',
+            'mtf-log-parser = moduleframework.mtf_log_parser:main',
         ]
     },
     setup_requires=[],

tools/mtf

@@ -2,7 +2,8 @@
 
 SITE_LIB=$(python -c "import moduleframework, os; print os.path.dirname(moduleframework.__file__)")
 MTF_TOOLS="tools"
-AVOCADO_ARGS=""
+JSON_LOG=$(mktemp)
+AVOCADO_ARGS="--json $JSON_LOG"
 
 function print_help {
   cat <<EOF
@@ -34,3 +35,5 @@ while [[ $# -gt 0 ]]; do
 done
 
 avocado run $AVOCADO_ARGS
+mtf-log-parser $JSON_LOG
+rm -f $JSON_LOG