test: replace panic in favor of ParseError #4558

leon3s · 2023-03-19T18:04:13Z

Closes #4556
Closes #4555

github-actions · 2023-03-19T20:56:54Z

GNU testsuite comparison:

GNU test failed: tests/tail-2/inotify-dir-recreate. tests/tail-2/inotify-dir-recreate is passing on 'main'. Maybe you have to rebase?

tertsdiepraam

Nice! I think we can even take this a bit further and avoid using strings as errors altogether if ParseError implements UError.

src/uu/test/src/parser.rs

tertsdiepraam

It's looking good! Just a few small suggestions.

src/uu/test/src/parser.rs

src/uu/test/src/error.rs

tertsdiepraam · 2023-03-25T09:39:56Z

src/uu/test/src/test.rs

@@ -128,23 +130,18 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> {
        }
    }

-    let result = parse(args).and_then(|mut stack| eval(&mut stack));
+    let result = parse(args).map(|mut stack| eval(&mut stack))??;


Is this equivalent to eval(parse(args)?)?

@tertsdiepraam Yes it is, you prefer eval(parse(args)?)? syntax ?

github-actions · 2023-03-25T15:31:03Z

GNU testsuite comparison:

Congrats! The gnu test tests/tail-2/inotify-dir-recreate is no longer failing!

leon3s · 2023-03-25T16:08:09Z

Look like the failling tests are related to #4634

sylvestre · 2023-03-26T08:07:28Z

thanks :)

leon3s changed the title ~~test: remplaced panic in favor of ParseError~~ test: (wip) remplaced panic in favor of ParseError Mar 19, 2023

cakebaker changed the title ~~test: (wip) remplaced panic in favor of ParseError~~ test: (wip) replace panic in favor of ParseError Mar 20, 2023

tertsdiepraam reviewed Mar 20, 2023

View reviewed changes

src/uu/test/src/parser.rs Outdated Show resolved Hide resolved

src/uu/test/src/parser.rs Show resolved Hide resolved

leon3s marked this pull request as draft March 20, 2023 16:22

leon3s changed the title ~~test: (wip) replace panic in favor of ParseError~~ test: replace panic in favor of ParseError Mar 25, 2023

leon3s marked this pull request as ready for review March 25, 2023 02:55

tertsdiepraam reviewed Mar 25, 2023

View reviewed changes

leon3s added 3 commits March 25, 2023 14:03

test: Remplaced panic in favor of ParseError

9fb18bb

test: refactor error handling with ParseError enum

bf94e8f

test: fmt + requested change

11fd56c

leon3s force-pushed the fix-test-with-parse-error branch from 393eb2b to 11fd56c Compare March 25, 2023 13:03

sylvestre merged commit 76793d5 into uutils:main Mar 26, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: replace panic in favor of ParseError #4558

test: replace panic in favor of ParseError #4558

leon3s commented Mar 19, 2023 •

edited

Loading

github-actions bot commented Mar 19, 2023

tertsdiepraam left a comment

tertsdiepraam left a comment

tertsdiepraam Mar 25, 2023

leon3s Mar 25, 2023 •

edited

Loading

github-actions bot commented Mar 25, 2023

leon3s commented Mar 25, 2023 •

edited

Loading

sylvestre commented Mar 26, 2023

test: replace panic in favor of ParseError #4558

test: replace panic in favor of ParseError #4558

Conversation

leon3s commented Mar 19, 2023 • edited Loading

github-actions bot commented Mar 19, 2023

tertsdiepraam left a comment

Choose a reason for hiding this comment

tertsdiepraam left a comment

Choose a reason for hiding this comment

tertsdiepraam Mar 25, 2023

Choose a reason for hiding this comment

leon3s Mar 25, 2023 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Mar 25, 2023

leon3s commented Mar 25, 2023 • edited Loading

sylvestre commented Mar 26, 2023

leon3s commented Mar 19, 2023 •

edited

Loading

leon3s Mar 25, 2023 •

edited

Loading

leon3s commented Mar 25, 2023 •

edited

Loading