[codacy] fix a few issues turned up

src/default-log-formats.json

@@ -1653,7 +1653,9 @@
         },
         "sample": [
             {
-                "line": "Thread-1950::INFO::2011-12-07 12:14:15,018::dispatcher::94::Storage.Dispatcher.Protect::(run) Run and protect: getDeviceList, args: ( storageType=2)",
+                "line": "Thread-1950::INFO::2011-12-07 12:14:15,018::dispatcher::94::Storage.Dispatcher.Protect::(run) Run and protect: getDeviceList, args: ( storageType=2)"
+            },
+            {
 		"line": "2017-03-06 14:49:05,167+0200 INFO  (vm/9e5dd42e) [virt.vm] (vmId='9e5dd42e-5177-4da3-a6ce-87fa2052d315') (vm:2104)"
             }
         ]

test/formats/jsontest/format.json

@@ -18,14 +18,12 @@
         "value" : {
             "user" : {
                 "kind" : "string",
-                "identifier" : true
+                "identifier" : true,
+                "rewriter" : "|rewrite-user"
             },
             "msg" : {
                 "rewriter" : ";SELECT :msg || 'bork bork bork'"
             },
-            "user" : {
-                "rewriter" : "|rewrite-user"
-            },
             "obj" : {
                 "kind" : "json"
             },

test/logfile_test.cc

@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2007-2012, Timothy Stack
- *
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of Timothy Stack nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "logfile.hh"
-
-int main(int argc, char *argv[])
-{
-    int retval = EXIT_SUCCESS;
-
-    try {
-	logfile::iterator iter;
-	logfile lf("test.log");
-
-	for (iter = lf.begin(); iter != lf.end(); iter++) {
-	    printf("%qd %d -- %s\n",
-		   iter->get_offset(),
-		   iter->get_time(),
-		   lf.read_line(iter).c_str());
-
-	    assert(lf.find_after_time(iter->get_time()) != lf.end());
-	    assert(lf.find_after_time(iter->get_time() + 1000000) == lf.end());
-	}
-    }
-    catch (logfile::error &e) {
-	printf("error: could not open log file -- %s\n", strerror(e.e_err));
-    }
-
-    return retval;
-}

test/parser_debugger.py

@@ -28,7 +28,6 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
-import json
 import string
 import readline
 import itertools

test/test_line_buffer.sh

@@ -50,7 +50,6 @@ EOF
 
 cat "${top_srcdir}/src/"*.hh "${top_srcdir}/src/"*.cc > lb-2.dat
 grep -b '$' lb-2.dat | cut -f 1 -d : > lb.index
-line_count=`wc -l lb-2.dat`
 
 run_test ./drive_line_buffer -i lb.index -n 10 lb-2.dat
 

test/test_reltime.cc

@@ -72,9 +72,9 @@ static struct {
     const char *reltime;
     const char *expected_error;
 } BAD_TEST_DATA[] = {
-        { "ago", "" },
-        { "minute", "" },
-        { "1 2", "" },
+        { "ago", "Expecting a time unit" },
+        { "minute", "Expecting a number before time unit" },
+        { "1 2", "No time unit given for the previous number" },
 
         { NULL, NULL }
 };
@@ -104,6 +104,7 @@ TEST_CASE("reltime")
         rt.clear();
         rc = rt.parse(BAD_TEST_DATA[lpc].reltime, pe);
         CHECK(!rc);
+        CHECK(pe.pe_msg == string(BAD_TEST_DATA[lpc].expected_error));
     }
 
     rt.clear();