Patchwork D9541: tests: conditionalize the progress timestamp for Windows

login
register
mail settings
Submitter phabricator
Date Dec. 8, 2020, 4:01 a.m.
Message ID <differential-rev-PHID-DREV-gxjpwdbtitnvsfccddbs-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47827/
State Superseded
Headers show

Comments

phabricator - Dec. 8, 2020, 4:01 a.m.
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9541

AFFECTED FILES
  tests/test-progress.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-progress.t b/tests/test-progress.t
--- a/tests/test-progress.t
+++ b/tests/test-progress.t
@@ -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)