Patchwork [STABLE] tests: stabilize test-inherit-mode.t on FreeBSD and macOS (issue6026)

login
register
mail settings
Submitter Augie Fackler
Date Nov. 29, 2018, 9:30 p.m.
Message ID <2a350cb39a459fea5767.1543527045@augie-macbookpro2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/36870/
State Accepted
Headers show

Comments

Augie Fackler - Nov. 29, 2018, 9:30 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1543526737 18000
#      Thu Nov 29 16:25:37 2018 -0500
# Branch stable
# Node ID 2a350cb39a459fea5767aa25804180be10849408
# Parent  25b7c4cb5de1593e16bbd7a7dafbd28baa743995
tests: stabilize test-inherit-mode.t on FreeBSD and macOS (issue6026)

Symbolic links are funny permissions-wise, but on the linked issue
Yuya has convinced me that we can ignore this permissions issue on
macOS (FreeBSD allows setting permissions bits but ignores them) and
we'll be in fine shape.
Yuya Nishihara - Nov. 30, 2018, 11:47 a.m.
On Thu, 29 Nov 2018 16:30:45 -0500, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1543526737 18000
> #      Thu Nov 29 16:25:37 2018 -0500
> # Branch stable
> # Node ID 2a350cb39a459fea5767aa25804180be10849408
> # Parent  25b7c4cb5de1593e16bbd7a7dafbd28baa743995
> tests: stabilize test-inherit-mode.t on FreeBSD and macOS (issue6026)

Queued for stable, thanks.
Boris Feld - Dec. 1, 2018, 12:08 p.m.
Thanks for taking care of this!

On 29/11/2018 22:30, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1543526737 18000
> #      Thu Nov 29 16:25:37 2018 -0500
> # Branch stable
> # Node ID 2a350cb39a459fea5767aa25804180be10849408
> # Parent  25b7c4cb5de1593e16bbd7a7dafbd28baa743995
> tests: stabilize test-inherit-mode.t on FreeBSD and macOS (issue6026)
>
> Symbolic links are funny permissions-wise, but on the linked issue
> Yuya has convinced me that we can ignore this permissions issue on
> macOS (FreeBSD allows setting permissions bits but ignores them) and
> we'll be in fine shape.
>
> diff --git a/tests/test-inherit-mode.t b/tests/test-inherit-mode.t
> --- a/tests/test-inherit-mode.t
> +++ b/tests/test-inherit-mode.t
> @@ -70,7 +70,7 @@ new directories are setgid
>    00770 ./.hg/cache/
>    00660 ./.hg/cache/branch2-served
>    00711 ./.hg/cache/checkisexec
> -  00777 ./.hg/cache/checklink
> +  007.. ./.hg/cache/checklink (re)
>    00600 ./.hg/cache/checklink-target
>    00660 ./.hg/cache/manifestfulltextcache (reporevlogstore !)
>    00660 ./.hg/cache/rbc-names-v1
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/test-inherit-mode.t b/tests/test-inherit-mode.t
--- a/tests/test-inherit-mode.t
+++ b/tests/test-inherit-mode.t
@@ -70,7 +70,7 @@  new directories are setgid
   00770 ./.hg/cache/
   00660 ./.hg/cache/branch2-served
   00711 ./.hg/cache/checkisexec
-  00777 ./.hg/cache/checklink
+  007.. ./.hg/cache/checklink (re)
   00600 ./.hg/cache/checklink-target
   00660 ./.hg/cache/manifestfulltextcache (reporevlogstore !)
   00660 ./.hg/cache/rbc-names-v1