# HG changeset patch # User Matt Harbison # Date 1607395440 18000 # Node ID 31ecf715efe265a4c03aa48f1b45a595e5a5f6a7 # Parent b2a743c3abbb9464ca6a4dfda2be29d8b2f9ce1a tests: conditionalize the progress timestamp for Windows It looks like for py2 on Windows, the start date is 1970. It matches the other platforms for py3, so I'm just going to match the tests and move on, given that py2 is on the way out. Differential Revision: https://phab.mercurial-scm.org/D9541 diff -r b2a743c3abbb -r 31ecf715efe2 tests/test-progress.t --- a/tests/test-progress.t Mon Dec 07 20:38:00 2020 -0500 +++ b/tests/test-progress.t Mon Dec 07 21:44:00 2020 -0500 @@ -203,17 +203,23 @@ test interaction with ui.timestamp-output +XXX: The timestamp on Windows with py2 hg is in 1970, and py3 hg is now. But +the py2/py3 checks here test the test runner, not the binary. The Windows lines +can be dropped when switching to py3-only. + $ hg loop --warn --config ui.timestamp-output=true 6 \r (no-eol) (esc) loop [ ] 0/6\r (no-eol) (esc) \r (no-eol) (esc) - \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] reached step 0 (re) + [*T*] reached step 0 (glob) (windows !) + \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] reached step 0 (re) (no-windows !) \r (no-eol) (esc) loop [=======> ] 1/6\r (no-eol) (esc) loop [===============> ] 2/6\r (no-eol) (esc) loop [=======================> ] 3/6\r (no-eol) (esc) \r (no-eol) (esc) - \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] reached step 3 (re) + [*T*] reached step 3 (glob) (windows !) + \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] reached step 3 (re) (no-windows !) \r (no-eol) (esc) loop [===============================> ] 4/6\r (no-eol) (esc) loop [=======================================> ] 5/6\r (no-eol) (esc)