D999: tests: use readlink.py instead of readlink

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Tue Oct 10 18:15:35 UTC 2017


durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The latter doesn't always exist, such as on Solaris-derived platforms.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-pathconflicts-update.t

CHANGE DETAILS

diff --git a/tests/test-pathconflicts-update.t b/tests/test-pathconflicts-update.t
--- a/tests/test-pathconflicts-update.t
+++ b/tests/test-pathconflicts-update.t
@@ -59,8 +59,8 @@
   a/b: replacing untracked file
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark dir)
-  $ readlink a/b.orig
-  x
+  $ readlink.py a/b.orig
+  a/b.orig -> x
   $ rm a/b.orig
 
 Update - local directory conflicts with remote file
@@ -94,8 +94,8 @@
   a/b: replacing untracked files in directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark link)
-  $ readlink a/b
-  c
+  $ readlink.py a/b
+  a/b -> c
   $ test -d a/b.orig
   $ rm -rf a/b.orig
 



To: durin42, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list