Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix empty xunit file on error. #118

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix empty xunit file on error. #118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a286aa
Fix empty xunit file on error.
mjonss Dec 6, 2023
1d8edfb
Merge branch 'master' into fix-xunit-result-xml-file
mjonss Dec 7, 2023
03bb96f
Merge branch 'master' into fix-xunit-result-xml-file
wuhuizuo Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 48 additions & 45 deletions src/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ func (t *tester) postProcess() {
t.mdb.Close()
}

func (t *tester) addFailure(testSuite *XUnitTestSuite, err *error, cnt int) {
func (t *tester) addFailure(err *error, cnt int) {
testSuite.TestCases = append(testSuite.TestCases, XUnitTestCase{
Classname: "",
Name: t.testFileName(),
Expand All @@ -313,7 +313,7 @@ func (t *tester) addFailure(testSuite *XUnitTestSuite, err *error, cnt int) {
testSuite.Failures++
}

func (t *tester) addSuccess(testSuite *XUnitTestSuite, startTime *time.Time, cnt int) {
func (t *tester) addSuccess(startTime *time.Time, cnt int) {
testSuite.TestCases = append(testSuite.TestCases, XUnitTestCase{
Classname: "",
Name: t.testFileName(),
Expand All @@ -328,13 +328,13 @@ func (t *tester) Run() error {
queries, err := t.loadQueries()
if err != nil {
err = errors.Trace(err)
t.addFailure(&testSuite, &err, 0)
t.addFailure(&err, 0)
return err
}

if err = t.openResult(); err != nil {
err = errors.Trace(err)
t.addFailure(&testSuite, &err, 0)
t.addFailure(&err, 0)
return err
}

Expand Down Expand Up @@ -378,15 +378,15 @@ func (t *tester) Run() error {
concurrentSize, err = strconv.Atoi(strings.TrimSpace(s))
if err != nil {
err = errors.Annotate(err, "Atoi failed")
t.addFailure(&testSuite, &err, testCnt)
t.addFailure(&err, testCnt)
return err
}
}
case Q_END_CONCURRENT:
t.enableConcurrent = false
if err = t.concurrentRun(concurrentQueue, concurrentSize); err != nil {
err = errors.Annotate(err, fmt.Sprintf("concurrent test failed in %v", t.name))
t.addFailure(&testSuite, &err, testCnt)
t.addFailure(&err, testCnt)
return err
}
t.expectedErrs = nil
Expand All @@ -405,7 +405,7 @@ func (t *tester) Run() error {
concurrentQueue = append(concurrentQueue, q)
} else if err = t.execute(q); err != nil {
err = errors.Annotate(err, fmt.Sprintf("sql:%v", q.Query))
t.addFailure(&testSuite, &err, testCnt)
t.addFailure(&err, testCnt)
return err
}

Expand All @@ -425,7 +425,7 @@ func (t *tester) Run() error {
colNr, err := strconv.Atoi(cols[i])
if err != nil {
err = errors.Annotate(err, fmt.Sprintf("Could not parse column in --replace_column: sql:%v", q.Query))
t.addFailure(&testSuite, &err, testCnt)
t.addFailure(&err, testCnt)
return err
}

Expand Down Expand Up @@ -501,7 +501,7 @@ func (t *tester) Run() error {
fmt.Printf("%s: ok! %d test cases passed, take time %v s\n", t.testFileName(), testCnt, time.Since(startTime).Seconds())

if xmlPath != "" {
t.addSuccess(&testSuite, &startTime, testCnt)
t.addSuccess(&startTime, testCnt)
}

return t.flushResult()
Expand Down Expand Up @@ -1141,21 +1141,7 @@ func consumeError() []error {
}
}

func main() {
flag.Parse()
tests := flag.Args()
startTime := time.Now()
if ll := os.Getenv("LOG_LEVEL"); ll != "" {
logLevel = ll
}
if logLevel != "" {
ll, err := log.ParseLevel(logLevel)
if err != nil {
log.Errorf("error parsing log level %s: %v", logLevel, err)
}
log.SetLevel(ll)
}

func writeXUnitFile(startTime time.Time) {
if xmlPath != "" {
_, err := os.Stat(xmlPath)
if err == nil {
Expand All @@ -1176,29 +1162,36 @@ func main() {
log.Error("open xunit file fail:", err)
os.Exit(1)
}

testSuite = XUnitTestSuite{
Name: "",
Tests: 0,
Failures: 0,
Properties: make([]XUnitProperty, 0),
TestCases: make([]XUnitTestCase, 0),
testSuite.Tests = len(testSuite.TestCases)
testSuite.Time = fmt.Sprintf("%fs", time.Since(startTime).Seconds())
testSuite.Properties = append(testSuite.Properties, XUnitProperty{
Name: "go.version",
Value: goVersion(),
})
err = Write(xmlFile, testSuite)
if err != nil {
log.Error("Write xunit file fail:", err)
}
err = xmlFile.Close()
if err != nil {
log.Error("Close xunit file fail:", err)
}
}
}

defer func() {
if xmlFile != nil {
testSuite.Tests = len(tests)
testSuite.Time = fmt.Sprintf("%fs", time.Since(startTime).Seconds())
testSuite.Properties = append(testSuite.Properties, XUnitProperty{
Name: "go.version",
Value: goVersion(),
})
err := Write(xmlFile, testSuite)
if err != nil {
log.Error("Write xunit file fail:", err)
}
}
}()
func main() {
flag.Parse()
tests := flag.Args()
startTime := time.Now()
if ll := os.Getenv("LOG_LEVEL"); ll != "" {
logLevel = ll
}
if logLevel != "" {
ll, err := log.ParseLevel(logLevel)
if err != nil {
log.Errorf("error parsing log level %s: %v", logLevel, err)
}
log.SetLevel(ll)
}

// we will run all tests if no tests assigned
Expand All @@ -1209,6 +1202,15 @@ func main() {
}
}

if xmlPath != "" {
testSuite = XUnitTestSuite{
Name: "",
Tests: 0,
Failures: 0,
Properties: make([]XUnitProperty, 0),
TestCases: make([]XUnitTestCase, 0),
}
}
if !record {
log.Infof("running tests: %v", tests)
} else {
Expand All @@ -1225,6 +1227,7 @@ func main() {

es := consumeError()
println()
writeXUnitFile(startTime)
if len(es) != 0 {
log.Errorf("%d tests failed\n", len(es))
for _, item := range es {
Expand Down
Loading