Merge pull request #231 from lmr/sprint-14-pendencies

Sprint 14 pendencies

avocado/job.py

@@ -446,14 +446,15 @@ class Job(object):
                     except SyntaxError:
                         variants = None
                     if variants:
+                        tag = 1
                         for variant in variants:
                             env = {}
                             for t in variant:
                                 env.update(dict(t.environment))
-                            tag = ".".join([str(var.name) for var in variant])
                             env.update({'tag': tag})
                             env.update({'id': url})
                             params_list.append(env)
+                            tag += 1
                     else:
                         params_list.append({'id': url})
 

avocado/plugins/multiplexer.py

@@ -80,12 +80,12 @@ class Multiplexer(plugin.Plugin):
         view.notify(event='message', msg='Variants generated:')
         for (index, tpl) in enumerate(variants):
             paths = ', '.join([x.path for x in tpl])
-            view.notify(event='message', msg='Variant %s:    %s' % (index+1, paths))
+            view.notify(event='minor', msg='Variant %s:    %s' % (index+1, paths))
             if args.contents:
                 env = collections.OrderedDict()
                 for node in tpl:
                     env.update(node.environment)
                 for k in sorted(env.keys()):
-                    view.notify(event='message', msg='    %s: %s' % (k, env[k]))
+                    view.notify(event='minor', msg='    %s: %s' % (k, env[k]))
 
         sys.exit(error_codes.numeric_status['AVOCADO_ALL_OK'])

man/avocado.rst

@@ -26,9 +26,7 @@ on them being loaded::
 
  -h, --help             show this help message and exit
  -v, --version          show program's version number and exit
- -V, --verbose          print extra debug messages
  --logdir LOGDIR        Alternate logs directory
- --loglevel LOG_LEVEL   Debug Level
  --plugins PLUGINS_DIR  Load extra plugins from directory
 
 Real use of avocado depends on running avocado subcommands. This a typical list
@@ -107,9 +105,32 @@ In order to do that, you can use --show-job-log to the avocado test runner::
 
     Not logging /proc/slabinfo (lack of permissions)
 
+Let's say you are debugging a test particularly large, with lots of debug
+output and you want to reduce this output to only messages with level 'INFO'
+and higher. You can use the option --job-log-level info to reduce the output.
+Running the same example with this option::
+
+    $ scripts/avocado run sleeptest --show-job-log --job-log-level info
+    START sleeptest.py
+    PASS sleeptest.py
+
+The levels you can choose are the levels available in the python logging system
+`https://docs.python.org/2/library/logging.html#logging-levels`, translated
+to lowercase strings, so 'notset', 'debug', 'info', 'warning', 'error',
+'critical', in order of severity.
+
 As you can see, the UI output is suppressed and only the job log goes to
 stdout, making this a useful feature for test development/debugging.
 
+SILENCING RUNNER STDOUT
+=======================
+
+You may specify --silent, that means avocado will turn off all runner
+stdout. Even if you specify things like --show-job-log in the CLI, --silent
+will have precedence and you will not get application stdout. Note that --silent
+does not affect on disk job logs, those continue to be generated normally.
+
+
 LISTING TESTS
 =============