Drop log verbosity levels

In the scope of unified logging, new options -vv and -vvv were
introduced. They set the luatest log level to VERBOSE and DEBUG,
respectively. Actually, there's no need to suppress any logging
because it goes to a file and doesn't spam the output. Besides,
it's ugly that we mix luatest logging with luatest output verbosity.
Let's drop the levels and use log.info instead of log.verbose or
log.debug everywhere in luatest.

No changelog because the feature was added by commit f8a1c10
("Add logging to unified file"), which hasn't been released yet.

Author: locker

luatest/helpers.lua

@@ -69,7 +69,7 @@ function helpers.retrying(config, fn, ...)
         if (clock.time() - started_at) > timeout then
             return fn(...)
         end
-        log.verbose('Retrying in %d sec due to error: %s', delay, result)
+        log.info('Retrying in %d sec due to error: %s', delay, result)
         fiber.sleep(delay)
     end
 end

luatest/hooks.lua

@@ -241,7 +241,7 @@ local function run_group_hooks(runner, group, hooks_type)
 end
 
 local function run_test_hooks(self, test, hooks_type, legacy_name)
-    log.verbose('Run hook %s', hooks_type)
+    log.info('Run hook %s', hooks_type)
     local group = test.group
     local hook
     -- Support for group.setup/teardown methods (legacy API)
@@ -256,7 +256,7 @@ local function run_test_hooks(self, test, hooks_type, legacy_name)
 end
 
 local function run_named_test_hooks(self, test, hooks_type)
-    log.verbose('Run hook %s', hooks_type)
+    log.info('Run hook %s', hooks_type)
     local group = test.group
     local hook = group['run_' .. hooks_type]
     if hook then

luatest/log.lua

@@ -30,14 +30,6 @@ function log.info(msg, ...)
     return _log('info', msg, ...)
 end
 
-function log.verbose(msg, ...)
-    return _log('verbose', msg, ...)
-end
-
-function log.debug(msg, ...)
-    return _log('debug', msg, ...)
-end
-
 function log.warn(msg, ...)
     return _log('warn', msg, ...)
 end

luatest/process.lua

@@ -77,7 +77,7 @@ function Process.mt:initialize()
         self._pid_ull = ffi.cast('void*', 0ULL + self.pid)
         ffi.gc(self._pid_ull, function(x)
             local pid = tonumber(ffi.cast(ffi.typeof(0ULL), x))
-            log.debug("Killing GC'ed process %d", pid)
+            log.info("Killing GC'ed process %d", pid)
             Process.kill_pid(pid, nil, {quiet = true})
         end)
     end

luatest/runner.lua

@@ -96,10 +96,7 @@ function Runner.run(args, options)
             -- Initialize logging for luatest runner.
             -- The log format will be as follows:
             --     YYYY-MM-DD HH:MM:SS.ZZZ [ID] main/.../luatest I> ...
-            require('log').cfg{
-                log = log_cfg,
-                level = options.log_level or 5,
-            }
+            require('log').cfg{log = log_cfg}
         end
 
         if options.help then
@@ -132,8 +129,6 @@ Options:
   -h, --help:             Print this help
   --version:              Print version information
   -v, --verbose:          Increase output verbosity for luatest runnner
-  -vv,                    Increase log verbosity to VERBOSE level for luatest runnner
-  -vvv,                   Increase log verbosity to DEBUG level for luatest runnner
   -q, --quiet:            Set verbosity to minimum
   -c, --no-capture        Disable capture
   -b                      Print full backtrace (don't remove luatest frames)
@@ -189,12 +184,6 @@ function Runner.parse_cmd_line(args)
             result.version = true
         elseif arg == '--verbose' or arg == '-v' then
             result.verbosity = GenericOutput.VERBOSITY.VERBOSE
-        elseif arg == '-vv' then
-            result.verbosity = GenericOutput.VERBOSITY.VERBOSE
-            result.log_level = 6 -- verbose
-        elseif arg == '-vvv' then
-            result.verbosity = GenericOutput.VERBOSITY.VERBOSE
-            result.log_level = 7 -- debug
         elseif arg == '--quiet' or arg == '-q' then
             result.verbosity = GenericOutput.VERBOSITY.QUIET
         elseif arg == '--fail-fast' or arg == '-f' then
@@ -350,13 +339,13 @@ function Runner.mt:bootstrap()
         load_tests(path)
     end
     self.groups = self.luatest.groups
-    log.verbose('Bootstrap finished: %d test(s), %d group(s)', #self.paths, #self.groups)
+    log.info('Bootstrap finished: %d test(s), %d group(s)', #self.paths, #self.groups)
 end
 
 function Runner.mt:cleanup()
     if not self.no_clean then
         fio.rmtree(Server.vardir)
-        log.verbose('Directory %s removed via cleanup procedure', Server.vardir)
+        log.info('Directory %s removed via cleanup procedure', Server.vardir)
     end
 end
 
@@ -540,7 +529,7 @@ function Runner.mt:run_tests(tests_list)
             end
             rawget(_G, 'current_test').value = test
             self:run_test(test)
-            log.verbose('Test %s marked as %s', test.name, test.status)
+            log.info('Test %s marked as %s', test.name, test.status)
             if self.result.aborted then
                 break
             end

luatest/server.lua

@@ -127,7 +127,7 @@ function Server:new(object, extra)
                     if not object.tests[t.name] then
                         object.tests[t.name] = t
                         t.servers[object.id] = object
-                        log.verbose('Server %s used in %s test', object.alias, t.name)
+                        log.info('Server %s used in %s test', object.alias, t.name)
                     end
                 end
                 return v(...)
@@ -513,7 +513,7 @@ end
 -- following string: `Failed to copy artifacts for server (alias: <alias>, workdir: <workdir>)`.
 function Server:save_artifacts()
     if self.artifacts_saved then
-        log.verbose('Artifacts of server %s already saved to %s', self.alias, self.artifacts)
+        log.info('Artifacts of server %s already saved to %s', self.alias, self.artifacts)
         return
     end
     local ok, err = fio.copytree(self.workdir, self.artifacts)
@@ -522,15 +522,15 @@ function Server:save_artifacts()
             :format(self.alias, fio.basename(self.workdir))
         log.error(('%s: %s'):format(self.artifacts, err))
     end
-    log.verbose('Artifacts of server %s saved from %s to %s',
+    log.info('Artifacts of server %s saved from %s to %s',
         self.alias, self.workdir, self.artifacts)
     self.artifacts_saved = true
 end
 
 -- Wait until the given condition is `true` (anything except `false` and `nil`).
 -- Throws an error when the server process is terminated or timeout exceeds.
 local function wait_for_condition(cond_desc, server, func, ...)
-    log.verbose('Wait for %s condition for server %s (pid: %d) within %d sec',
+    log.info('Wait for %s condition for server %s (pid: %d) within %d sec',
         cond_desc, server.alias, server.process.pid, WAIT_TIMEOUT)
     local deadline = clock.time() + WAIT_TIMEOUT
     while true do
@@ -559,7 +559,7 @@ function Server:stop()
             self:coverage('shutdown')
         end
         self.net_box:close()
-        log.verbose('Connection to server %s (pid: %d) closed', self.alias, self.process.pid)
+        log.info('Connection to server %s (pid: %d) closed', self.alias, self.process.pid)
         self.net_box = nil
     end
 
@@ -895,7 +895,7 @@ function Server:grep_log(pattern, bytes_num, opts)
         return rawget(_G, 'box_cfg_log_file') or box.cfg.log end)
     local file = fio.open(filename, {'O_RDONLY', 'O_NONBLOCK'})
 
-    log.verbose('Trying to grep %s in server\'s log file %s', pattern, filename)
+    log.info('Trying to grep %s in server\'s log file %s', pattern, filename)
 
     local function fail(msg)
         local err = errno.strerror()