From 1c2a16a67ee900a13e08a3043123a93285ac404b Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Fri, 7 Jan 2022 12:29:34 +0100 Subject: [PATCH 1/4] Made 'make test' work + moved two logs to Debug for less verbose output --- src/main.go | 19 ++++++++++++------- src/query_test.go | 14 +++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main.go b/src/main.go index a4eb961..e78f3f6 100644 --- a/src/main.go +++ b/src/main.go @@ -219,7 +219,7 @@ func (t *tester) preProcess() { log.Fatalf("Open db err %v", err) } - log.Warn("Create new db", mdb) + log.Debug("Create new db", mdb) if _, err = mdb.Exec(fmt.Sprintf("create database `%s`", t.name)); err != nil { log.Fatalf("Executing create db %s err[%v]", t.name, err) @@ -466,12 +466,8 @@ func (t *tester) concurrentExecute(querys []query, wg *sync.WaitGroup, errOccure } return } -func (t *tester) loadQueries() ([]query, error) { - data, err := ioutil.ReadFile(t.testFileName()) - if err != nil { - return nil, err - } +func parseQueryLines(data []byte) []query { seps := bytes.Split(data, []byte("\n")) queries := make([]query, 0, len(seps)) newStmt := true @@ -501,7 +497,16 @@ func (t *tester) loadQueries() ([]query, error) { // if the line has a ; in the end, we will treat new line as the new statement. newStmt = strings.HasSuffix(s, ";") } + return queries +} + +func (t *tester) loadQueries() ([]query, error) { + data, err := ioutil.ReadFile(t.testFileName()) + if err != nil { + return nil, err + } + queries := parseQueryLines(data) return ParseQueries(queries...) } @@ -993,7 +998,7 @@ func consumeError() []error { log.Errorln(e) es = append(es, e) } else { - log.Infof("run test [%s] ok", t.test) + log.Debugf("run test [%s] ok", t.test) } } else { diff --git a/src/query_test.go b/src/query_test.go index bc54a19..7406bc6 100644 --- a/src/query_test.go +++ b/src/query_test.go @@ -29,16 +29,16 @@ func assertEqual(t *testing.T, a interface{}, b interface{}, message string) { } func TestParseQueryies(t *testing.T) { - query := "select * from t;" - if q, err := ParseQueries(query); err == nil { + query := []byte("select * from t;") + if q, err := ParseQueries(parseQueryLines(query)...); err == nil { assertEqual(t, q[0].tp, Q_QUERY, fmt.Sprintf("Expected: %d, got: %d", Q_QUERY, q[0].tp)) - assertEqual(t, q[0].Query, query, fmt.Sprintf("Expected: %s, got: %s", query, q[0].Query)) + assertEqual(t, q[0].Query, string(query), fmt.Sprintf("Expected: %s, got: %s", query, q[0].Query)) } else { t.Fatalf("error is not nil. %v", err) } - query = "--sorted_result select * from t;" - if q, err := ParseQueries(query); err == nil { + query = []byte("--sorted_result select * from t;") + if q, err := ParseQueries(parseQueryLines(query)...); err == nil { assertEqual(t, q[0].tp, Q_SORTED_RESULT, "sorted_result") assertEqual(t, q[0].Query, "select * from t;", fmt.Sprintf("Expected: '%s', got '%s'", "select * from t;", q[0].Query)) } else { @@ -46,8 +46,8 @@ func TestParseQueryies(t *testing.T) { } // invalid comment command style - query = "--abc select * from t;" - _, err := ParseQueries(query) + query = []byte("--abc select * from t;") + _, err := ParseQueries(parseQueryLines(query)...) assertEqual(t, err, ErrInvalidCommand, fmt.Sprintf("Expected: %v, got %v", ErrInvalidCommand, err)) } From 35e9118414df9af685cf3e4ea3bb1edf2685d572 Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Fri, 7 Jan 2022 15:14:56 +0100 Subject: [PATCH 2/4] Added support for --log-level (from @dveeden) --- src/main.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main.go b/src/main.go index e78f3f6..ff76737 100644 --- a/src/main.go +++ b/src/main.go @@ -1010,6 +1010,11 @@ func consumeError() []error { func main() { flag.Parse() tests := flag.Args() + intLogLevel, err := log.ParseLevel(logLevel) + if err != nil { + log.Fatal(err) + } + log.SetLevel(intLogLevel) // we will run all tests if no tests assigned if len(tests) == 0 { From be06481693d90d331fc671e6181160322654b469 Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Fri, 7 Jan 2022 15:30:38 +0100 Subject: [PATCH 3/4] reverted one log from info <=> debug, since --log-level now works --- src/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.go b/src/main.go index ff76737..12ee97c 100644 --- a/src/main.go +++ b/src/main.go @@ -998,7 +998,7 @@ func consumeError() []error { log.Errorln(e) es = append(es, e) } else { - log.Debugf("run test [%s] ok", t.test) + log.Infof("run test [%s] ok", t.test) } } else { From abbe9eeea217d45669a6c9fbfe963b0549895be9 Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Tue, 8 Nov 2022 23:00:52 -0800 Subject: [PATCH 4/4] Fixed logging, now passes make test --- src/main.go | 8 ++++---- src/xml.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main.go b/src/main.go index b689d91..b7e1514 100644 --- a/src/main.go +++ b/src/main.go @@ -1089,19 +1089,19 @@ func main() { if err == nil { err = os.Remove(xmlPath) if err != nil { - log.Errorf("drop previous xunit file fail: ", err) + log.Errorf("drop previous xunit file fail: %v", err) os.Exit(1) } } xmlFile, err = os.Create(xmlPath) if err != nil { - log.Errorf("create xunit file fail:", err) + log.Errorf("create xunit file fail: %v", err) os.Exit(1) } xmlFile, err = os.OpenFile(xmlPath, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600) if err != nil { - log.Errorf("open xunit file fail:", err) + log.Errorf("open xunit file fail: %v", err) os.Exit(1) } @@ -1123,7 +1123,7 @@ func main() { }) err := Write(xmlFile, testSuite) if err != nil { - log.Errorf("Write xunit file fail:", err) + log.Errorf("Write xunit file fail: %v", err) } } }() diff --git a/src/xml.go b/src/xml.go index 12f453a..0f5a13f 100644 --- a/src/xml.go +++ b/src/xml.go @@ -63,7 +63,7 @@ func Write(out io.Writer, testSuite XUnitTestSuite) error { testSuites.Suites = append(testSuites.Suites, testSuite) _, err := out.Write([]byte(xml.Header)) if err != nil { - log.Errorf("write xunit file fail:", err) + log.Errorf("write xunit file fail: %v", err) return err } doc, err := xml.MarshalIndent(testSuites, "", "\t")