make junit output more consistent with default format #89235

yaahc · 2021-09-24T21:48:16Z

The default format of libtest includes new-lines between each section to ensure the label output from cargo is on it's own line

❯ cargo test
   Compiling test-test v0.1.0 (/home/jlusby/tmp/test-test)
    Finished test [unoptimized   debuginfo] target(s) in 0.59s
     Running unittests (target/debug/deps/test_test-639f369234319c09)

running 1 test
test tests::it_works ... ok

test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

   Doc-tests test-test

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

But when the junit outputter was added to libtest these newlines were omitted, resulting in some "fun" output when run via cargo.

Note the Doc-tests text at the end of the first line of xml.

❯ cargo test -- -Zunstable-options --format junit
    Finished test [unoptimized   debuginfo] target(s) in 0.00s
     Running unittests (target/debug/deps/test_test-639f369234319c09)
<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="0" tests="1" skipped="0" ><testcase classname="tests" name="it_works" time="0"/><system-out/><system-err/></testsuite></testsuites>   Doc-tests test-test
<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="0" tests="0" skipped="0" ><system-out/><system-err/></testsuite></testsuites>

After this PR the junit output includes the same style of newlines as the pretty format

❯ cargo test -- -Zunstable-options --format junit
   Compiling test-test v0.1.0 (/home/jlusby/tmp/test-test)
    Finished test [unoptimized   debuginfo] target(s) in 0.39s
     Running unittests (target/debug/deps/test_test-42c2320bb9450c69)

<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="0" tests="1" skipped="0" ><testcase classname="tests" name="it_works" time="0"/><system-out/><system-err/></testsuite></testsuites>

   Doc-tests test-test

<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="0" tests="0" skipped="0" ><system-out/><system-err/></testsuite></testsuites>

rust-highfive · 2021-09-24T21:48:18Z

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

yaahc · 2021-09-24T21:56:22Z

r? rust-lang/libs

yaahc · 2021-09-24T22:08:28Z

@andoriyu since you authored the original junit PR I wanted to double check with you that the newlines I'm adding don't mess with any of your original design goals. I know there's the assert against newlines in write_message and I assumed that was to prevent newlines in the middle of the xml output. I figured that it would however be fine to include extra newlines before and after.

andoriyu · 2021-09-25T03:20:52Z

@andoriyu since you authored the original junit PR I wanted to double check with you that the newlines I'm adding don't mess with any of your original design goals. I know there's the assert against newlines in write_message and I assumed that was to prevent newlines in the middle of the xml output. I figured that it would however be fine to include extra newlines before and after.

I think adding newlines is fine.

kennytm

r=me but i think we could use b"…" instead of "…".aṡ_bytes().

library/test/src/formatters/junit.rs

Co-authored-by: kennytm <[email protected]>

kennytm · 2021-09-27T22:28:10Z

@bors r rollup

bors · 2021-09-27T22:28:13Z

📌 Commit 0911069 has been approved by kennytm

make junit output more consistent with default format The default format of libtest includes new-lines between each section to ensure the label output from cargo is on it's own line <pre>❯ cargo test Compiling test-test v0.1.0 (/home/jlusby/tmp/test-test) Finished test [unoptimized debuginfo] target(s) in 0.59s Running unittests (target/debug/deps/test_test-639f369234319c09) running 1 test test tests::it_works ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s Doc-tests test-test running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s </pre> But when the junit outputter was added to libtest these newlines were omitted, resulting in some "fun" output when run via cargo. Note the `Doc-tests` text at the end of the first line of xml. <pre>❯ cargo test -- -Zunstable-options --format junit Finished test [unoptimized debuginfo] target(s) in 0.00s Running unittests (target/debug/deps/test_test-639f369234319c09) <?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="0" tests="1" skipped="0" ><testcase classname="tests" name="it_works" time="0"/><system-out/><system-err/></testsuite></testsuites> Doc-tests test-test <?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="0" tests="0" skipped="0" ><system-out/><system-err/></testsuite></testsuites> </pre> After this PR the junit output includes the same style of newlines as the pretty format <pre>❯ cargo test -- -Zunstable-options --format junit Compiling test-test v0.1.0 (/home/jlusby/tmp/test-test) Finished test [unoptimized debuginfo] target(s) in 0.39s Running unittests (target/debug/deps/test_test-42c2320bb9450c69) <?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="0" tests="1" skipped="0" ><testcase classname="tests" name="it_works" time="0"/><system-out/><system-err/></testsuite></testsuites> Doc-tests test-test <?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="0" tests="0" skipped="0" ><system-out/><system-err/></testsuite></testsuites> </pre>

…laumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#87260 (Libgccjit codegen) - rust-lang#89212 (x.py: run `rustup toolchain link` in setup) - rust-lang#89233 (Hide `<...> defined here` note if the source is not available) - rust-lang#89235 (make junit output more consistent with default format) - rust-lang#89255 (Fix incorrect disambiguation suggestion for associated items) - rust-lang#89276 (Fix the population of the `union.impls` field) - rust-lang#89283 (Add regression test for issue rust-lang#83564) - rust-lang#89318 (rustc_session: Remove lint store from `Session`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

make junit output more consistent with default format

7779eb7

rust-highfive assigned Mark-Simulacrum Sep 24, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 24, 2021

yaahc added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Sep 24, 2021

rust-highfive assigned kennytm and unassigned Mark-Simulacrum Sep 24, 2021

kennytm approved these changes Sep 25, 2021

View reviewed changes

library/test/src/formatters/junit.rs Outdated Show resolved Hide resolved

library/test/src/formatters/junit.rs Outdated Show resolved Hide resolved

Apply suggestions from code review

0911069

Co-authored-by: kennytm <[email protected]>

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 27, 2021

This was referenced Sep 28, 2021

Rollup of 9 pull requests #89330

Closed

Rollup of 8 pull requests #89331

Merged

bors merged commit e601554 into rust-lang:master Sep 29, 2021

rustbot added this to the 1.57.0 milestone Sep 29, 2021

yaahc deleted the junit-formatting branch September 29, 2021 22:47

yaahc mentioned this pull request Jan 31, 2022

Libtest generated junit report includes extra newline at the start. #93454

Closed

dtolnay mentioned this pull request Feb 2, 2022

fix: Remove extra newlines from junit output #93600

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

make junit output more consistent with default format #89235

make junit output more consistent with default format #89235

yaahc commented Sep 24, 2021

rust-highfive commented Sep 24, 2021

yaahc commented Sep 24, 2021

yaahc commented Sep 24, 2021

andoriyu commented Sep 25, 2021

kennytm left a comment

kennytm commented Sep 27, 2021

bors commented Sep 27, 2021

make junit output more consistent with default format #89235

make junit output more consistent with default format #89235

Conversation

yaahc commented Sep 24, 2021

rust-highfive commented Sep 24, 2021

yaahc commented Sep 24, 2021

yaahc commented Sep 24, 2021

andoriyu commented Sep 25, 2021

kennytm left a comment

Choose a reason for hiding this comment

kennytm commented Sep 27, 2021

bors commented Sep 27, 2021