Mercurial > hg-stable

changeset 46078:31ecf715efe2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 07 Dec 2020 21:44:00 -0500
parents b2a743c3abbb
children 3ca9d26c5984
files tests/test-progress.t
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)