From 30fd816525f9159721899c9bc38d659ce5eac7ee Mon Sep 17 00:00:00 2001
From: Phil Cohen <phillco@fb.com>
Date: Wed, 6 Jun 2018 15:40:46 -0700
Subject: [PATCH] tests: disable test-subrepo-git.t pending a git issue

Summary:
See t30174052 -- new version of FB git seems to have trouble pushing to other dirs. Let's turn these tests off for now to resume the contbuild.

Disable test-hggit-branch-bookmark-suffix.t too.

Reviewed By: DurhamG

Differential Revision: D8306205

fbshipit-source-id: b8f10f0158e38608ed5b6a96bd8da52aa211f8d7
---
 tests/test-hggit-branch-bookmark-suffix.t |  4 ++++
 tests/test-subrepo-git.t                  | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/test-hggit-branch-bookmark-suffix.t b/tests/test-hggit-branch-bookmark-suffix.t
index 14454c9897..8e17d49409 100644
--- a/tests/test-hggit-branch-bookmark-suffix.t
+++ b/tests/test-hggit-branch-bookmark-suffix.t
@@ -1,3 +1,7 @@
+Disable this test until t30174052 is fixed (git 2.17.1 issue w/ pushing to
+different dirs)
+  $ exit 80
+
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
 
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
index 03971c9ef7..078256e310 100644
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -1,5 +1,9 @@
 #require git
 
+Disable this test until t30174052 is fixed (git 2.17.1 issue w/ pushing to
+different dirs)
+  $ exit 80
+
 make git commits repeatable
 
   $ cat >> $HGRCPATH <<EOF
@@ -749,7 +753,7 @@ check differences made by most recent change
   $ cd s
   $ cat > foobar << EOF
   > woopwoop
-  > 
+  >
   > foo
   > bar
   > EOF
@@ -815,7 +819,7 @@ add new changes, including whitespace
   $ cd s
   $ cat > foobar << EOF
   > woop    woop
-  > 
+  >
   > foo
   > bar
   > EOF
@@ -839,7 +843,7 @@ add new changes, including whitespace
   @@ -1,4 +1,4 @@
   -woopwoop
   +woop    woop
-   
+
    foo
    bar
 
@@ -860,7 +864,7 @@ adding an include should ignore the other elements
   @@ -1,4 +1,4 @@
   -woopwoop
   +woop    woop
-   
+
    foo
    bar
 
@@ -1210,7 +1214,7 @@ whitelisting of ext should be respected (that's the git submodule behaviour)
   > malicious-subrepository malicious-subrepository-clone-allowed
   Cloning into '$TESTTMP/tc/malicious-subrepository-clone-allowed/s'...
   fatal: Could not read from remote repository.
-  
+
   Please make sure you have the correct access rights
   and the repository exists.
   updating to branch default