Fix touch timezone calculation #4309

ctsk · 2023-01-29T20:53:48Z

The timezone offset calculation didn't take into account that some locales change their UTC offset throughout the year (like due to daylight savings time). This change fixes.

Fixes #4236

sylvestre · 2023-01-29T21:10:12Z

Could you please add a test to make sure it doesn't regress?

jfinkels · 2023-02-05T18:23:30Z

looks like there were some test failures in the CI; I've restarted it and copied the failures I saw here:


failures:

error: test failed, to rerun pass '-p coreutils --test tests'
---- test_touch::test_touch_tz_crosses_dst stdout ----
current_directory_resolved: 
run: /home/runner/work/coreutils/coreutils/target/debug/coreutils touch -t 202301010000 -a test_touch_tz_crosses_dst_file
thread 'test_touch::test_touch_tz_crosses_dst' panicked at 'assertion failed: t1 == atime_cet.seconds() + 60 * 60', tests/by-util/test_touch.rs:863:5
stack backtrace:
   0: rust_begin_unwind
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/std/src/panicking.rs:584:5
   1: core::panicking::panic_fmt
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/panicking.rs:143:14
   2: core::panicking::panic
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/panicking.rs:48:5
   3: tests::test_touch::test_touch_tz_crosses_dst
             at ./tests/by-util/test_touch.rs:863:5
   4: tests::test_touch::test_touch_tz_crosses_dst::{{closure}}
             at ./tests/by-util/test_touch.rs:850:1
   5: core::ops::function::FnOnce::call_once
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/ops/function.rs:227:5
   6: core::ops::function::FnOnce::call_once
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/ops/function.rs:227:5
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

---- test_who::test_boot stdout ----
current_directory_resolved: 
run: who --version
uutils-tests-info: version for the reference coreutil 'who' is higher than expected; expected: 8.3, found: 8.32
run: who -b
run: /home/runner/work/coreutils/coreutils/target/debug/coreutils who -b
thread 'test_who::test_boot' panicked at 'assertion failed: `(left == right)`

Diff < left / right > :
<         system boot  Jan 31 14:34
>         system boot  Jan 31 15:34
 

', tests/by-util/test_who.rs:32:39
stack backtrace:
   0: rust_begin_unwind
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/std/src/panicking.rs:584:5
   1: core::panicking::panic_fmt
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/panicking.rs:143:14
   2: tests::common::util::CmdResult::stdout_is
             at ./tests/common/util.rs:449:9
   3: tests::test_who::test_boot
             at ./tests/by-util/test_who.rs:32:9
   4: tests::test_who::test_boot::{{closure}}
             at ./tests/by-util/test_who.rs:28:1
   5: core::ops::function::FnOnce::call_once
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/ops/function.rs:227:5
   6: core::ops::function::FnOnce::call_once
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/ops/function.rs:227:5
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

---- test_who::test_login stdout ----
current_directory_resolved: 
run: who --version
uutils-tests-info: version for the reference coreutil 'who' is higher than expected; expected: 8.3, found: 8.32
run: who -l
run: /home/runner/work/coreutils/coreutils/target/debug/coreutils who -l
thread 'test_who::test_login' panicked at 'assertion failed: `(left == right)`

Diff < left / right > :
<LOGIN    ttyS0        Jan 31 14:34               717 id=tyS0
<LOGIN    tty1         Jan 31 14:34               748 id=tty1
>LOGIN    ttyS0        Jan 31 15:34               717 id=tyS0
>LOGIN    tty1         Jan 31 15:34               748 id=tty1
 

', tests/by-util/test_who.rs:72:39
stack backtrace:
   0: rust_begin_unwind
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/std/src/panicking.rs:584:5
   1: core::panicking::panic_fmt
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/panicking.rs:143:14
   2: tests::common::util::CmdResult::stdout_is
             at ./tests/common/util.rs:449:9
   3: tests::test_who::test_login
             at ./tests/by-util/test_who.rs:72:9
   4: tests::test_who::test_login::{{closure}}
             at ./tests/by-util/test_who.rs:68:1
   5: core::ops::function::FnOnce::call_once
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/ops/function.rs:227:5
   6: core::ops::function::FnOnce::call_once
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/ops/function.rs:227:5
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

---- test_who::test_runlevel stdout ----
current_directory_resolved: 
run: who --version
uutils-tests-info: version for the reference coreutil 'who' is higher than expected; expected: 8.3, found: 8.32
run: who -r
run: /home/runner/work/coreutils/coreutils/target/debug/coreutils who -r
thread 'test_who::test_runlevel' panicked at 'assertion failed: `(left == right)`

Diff < left / right > :
<         run-level 5  Jan 31 14:34
>         run-level 5  Jan 31 15:34
 

', tests/by-util/test_who.rs:100:39
stack backtrace:
   0: rust_begin_unwind
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/std/src/panicking.rs:584:5
   1: core::panicking::panic_fmt
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/panicking.rs:143:14
   2: tests::common::util::CmdResult::stdout_is
             at ./tests/common/util.rs:449:9
   3: tests::test_who::test_runlevel
             at ./tests/by-util/test_who.rs:100:9
   4: tests::test_who::test_runlevel::{{closure}}
             at ./tests/by-util/test_who.rs:96:1
   5: core::ops::function::FnOnce::call_once
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/ops/function.rs:227:5
   6: core::ops::function::FnOnce::call_once
             at /rustc/7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c/library/core/src/ops/function.rs:227:5
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.


failures:
    test_touch::test_touch_tz_crosses_dst
    test_who::test_boot
    test_who::test_login
    test_who::test_runlevel

test result: FAILED. 2484 passed; 4 failed; 39 ignored; 0 measured; 0 filtered out; finished in 150.67s

ctsk · 2023-02-07T11:02:24Z

Hmm... Perhaps the setenv break subsequent tests?

tertsdiepraam · 2023-02-07T12:06:24Z

We should probably add some function in the test utils that sets an environment variable for the subcommand to make this easier without messing up the env variables.

github-actions · 2023-02-07T17:47:18Z

GNU testsuite comparison:

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

to_local assumed that the timezone offset at the specified time would match the current timezone. This is not the case if the current locale adheres to e.g. daylight savings time. Fixes uutils#4236

sylvestre · 2023-04-22T06:05:23Z

@ctsk i noticed that you have closed this PR and #4316 (comment)
you aren't interested in finishing them? thanks

ctsk force-pushed the fix/touch-timezone branch from 7cc7853 to ee23fe7 Compare January 29, 2023 20:57

sylvestre force-pushed the fix/touch-timezone branch from 3562dd6 to e2d898e Compare February 7, 2023 08:23

ctsk force-pushed the fix/touch-timezone branch from 1bf597b to e31d71d Compare February 7, 2023 17:52

ctsk and others added 4 commits February 17, 2023 17:45

touch: Compute tz offset at desired time

e699e80

to_local assumed that the timezone offset at the specified time would match the current timezone. This is not the case if the current locale adheres to e.g. daylight savings time. Fixes uutils#4236

touch: Test in timezone with DST

35a6349

Add CEST to the ignore list

ba31b37

touch: Reset timezone after test

8687497

sylvestre force-pushed the fix/touch-timezone branch from e31d71d to 8687497 Compare February 17, 2023 16:45

uutils deleted a comment from github-actions bot Mar 27, 2023

Merge branch 'main' into fix/touch-timezone

d7cbdd9

ctsk closed this Apr 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Fix touch timezone calculation #4309

Fix touch timezone calculation #4309

Uh oh!

ctsk commented Jan 29, 2023

Uh oh!

sylvestre commented Jan 29, 2023

Uh oh!

jfinkels commented Feb 5, 2023

Uh oh!

ctsk commented Feb 7, 2023

Uh oh!

tertsdiepraam commented Feb 7, 2023

Uh oh!

github-actions bot commented Feb 7, 2023

Uh oh!

sylvestre commented Apr 22, 2023

Uh oh!

Uh oh!

Uh oh!

Fix touch timezone calculation #4309

Fix touch timezone calculation #4309

Uh oh!

Conversation

ctsk commented Jan 29, 2023

Uh oh!

sylvestre commented Jan 29, 2023

Uh oh!

jfinkels commented Feb 5, 2023

Uh oh!

ctsk commented Feb 7, 2023

Uh oh!

tertsdiepraam commented Feb 7, 2023

Uh oh!

github-actions bot commented Feb 7, 2023

Uh oh!

sylvestre commented Apr 22, 2023

Uh oh!

Uh oh!