# HG changeset patch # User Matt Harbison # Date 2017-11-15 03:35:42 # Node ID a2e927ded455197e29c3b12de164d972f6fea225 # Parent e397f8585953b180bd4a1dfb000c7b38dc853958 hghave: add a check for lfs-test-server This is consistent with how the other tests require a feature. diff --git a/tests/hghave.py b/tests/hghave.py --- a/tests/hghave.py +++ b/tests/hghave.py @@ -284,6 +284,17 @@ def getgitversion(): return (0, 0) return (int(m.group(1)), int(m.group(2))) +# https://github.com/git-lfs/lfs-test-server +@check("lfs-test-server", "git-lfs test server") +def has_lfsserver(): + exe = 'lfs-test-server' + if has_windows(): + exe = 'lfs-test-server.exe' + return any( + os.access(os.path.join(path, exe), os.X_OK) + for path in os.environ["PATH"].split(os.pathsep) + ) + @checkvers("git", "git client (with ext::sh support) version >= %s", (1.9,)) def has_git_range(v): major, minor = v.split('.')[0:2] diff --git a/tests/test-lfs-test-server.t b/tests/test-lfs-test-server.t --- a/tests/test-lfs-test-server.t +++ b/tests/test-lfs-test-server.t @@ -1,6 +1,4 @@ -Require lfs-test-server (https://github.com/git-lfs/lfs-test-server) - - $ hash lfs-test-server || { echo 'skipped: missing lfs-test-server'; exit 80; } +#require lfs-test-server $ LFS_LISTEN="tcp://:$HGPORT" $ LFS_HOST="localhost:$HGPORT"