From e45985d8463a5312694adba67372e6048bba5650 Mon Sep 17 00:00:00 2001 From: Kostia Balytskyi Date: Tue, 23 Jan 2018 12:09:12 -0800 Subject: [PATCH] hggit: skip, not fail a test if dulwich is missing Summary: This manifests itself on MacBooks where dulwich is not installed. Differential Revision: D6759617 fbshipit-source-id: c90c35ebaa4fd2a14b1ad2fa0fadaca3c6ea8c29 --- tests/test-check-code.t | 3 --- tests/test-remotenames-basic.t | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/test-check-code.t b/tests/test-check-code.t index fe15c16f6a..7e9b3f825e 100644 --- a/tests/test-check-code.t +++ b/tests/test-check-code.t @@ -203,9 +203,6 @@ New errors are not allowed. Warnings are strongly discouraged. Skipping tests/test-hgsubversion-template-keywords.py it has no-che?k-code (glob) Skipping tests/test-hgsubversion-urls.py it has no-che?k-code (glob) Skipping tests/test-hgsubversion-utility-commands.py it has no-che?k-code (glob) - tests/test-remotenames-basic.t:308: - > $ hg help bookmarks | grep -A 3 -- '--track' - don't use grep's context flags Skipping tests/test_hgsubversion_util.py it has no-che?k-code (glob) [1] diff --git a/tests/test-remotenames-basic.t b/tests/test-remotenames-basic.t index 0795d28cd6..633ec72779 100644 --- a/tests/test-remotenames-basic.t +++ b/tests/test-remotenames-basic.t @@ -301,15 +301,14 @@ Test clone --mirror Test loading with hggit + $ . "$TESTDIR/hggit/testutil" $ echo "[extensions]" >> $HGRCPATH $ echo "hggit=" >> $HGRCPATH $ echo "[devel]" >> $HGRCPATH $ echo "all-warnings=no" >> $HGRCPATH - $ hg help bookmarks | grep -A 3 -- '--track' + $ hg help bookmarks | egrep -- '--(un){0,1}track' -t --track BOOKMARK track this bookmark or remote name -u --untrack remove tracking for this bookmark - -a --all show both remote and local bookmarks - --remote show only remote bookmarks Test branches marked as closed are not loaded $ cd ../alpha