Merge pull request git-lfs#5906 from chrisd8088/test-cleanups

Always capture clone logs in tests and remove or update stale workarounds

Author: chrisd8088

t/t-batch-error-handling.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-# This is a sample Git LFS test.  See test/README.md and testhelpers.sh for
-# more documentation.
 
 . "$(dirname "$0")/testlib.sh"
 

t/t-batch-transfer.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-# This is a sample Git LFS test.  See test/README.md and testhelpers.sh for
-# more documentation.
 
 . "$(dirname "$0")/testlib.sh"
 

t/t-chunked-transfer-encoding.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-# This is a sample Git LFS test.  See test/README.md and testhelpers.sh for
-# more documentation.
 
 . "$(dirname "$0")/testlib.sh"
 

t/t-clone.sh

@@ -179,10 +179,6 @@ begin_test "clone ClientCert"
   reponame="test-cloneClientCert"
   setup_remote_repo "$reponame"
   clone_repo_clientcert "$reponame" "$reponame"
-  if [ $(grep -c "client-cert-mac-openssl" clone_client_cert.log) -gt 0 ]; then
-    echo "Skipping due to SSL client cert bug in Git"
-    exit 0
-  fi
 
   git lfs track "*.dat" 2>&1 | tee track.log
   grep "Tracking \"\*.dat\"" track.log
@@ -267,10 +263,6 @@ begin_test "clone ClientCert with homedir certs"
 
   setup_remote_repo "$reponame"
   clone_repo_clientcert "$reponame" "$reponame"
-  if [ $(grep -c "client-cert-mac-openssl" clone_client_cert.log) -gt 0 ]; then
-    echo "Skipping due to SSL client cert bug in Git"
-    exit 0
-  fi
 
   git lfs track "*.dat" 2>&1 | tee track.log
   grep "Tracking \"\*.dat\"" track.log

t/t-env.sh

@@ -10,6 +10,10 @@ if [ "$IS_WINDOWS" -eq 1 ]; then
   export MSYS2_ENV_CONV_EXCL="GIT_LFS_TEST_DIR"
 fi
 
+# The "git lfs env" command should ignore this environment variable
+# despite the "GIT_" strings in its name and value.
+export TEST_GIT_EXAMPLE="GIT_EXAMPLE"
+
 begin_test "env with no remote"
 (
   set -e

t/t-happy-path.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
-# This is a sample Git LFS test.  See test/README.md and testhelpers.sh for
-# more documentation.
 
 . "$(dirname "$0")/testlib.sh"
 
+# This is a sample Git LFS test.  See test/README.md and testhelpers.sh for
+# more documentation.
 begin_test "happy path"
 (
   set -e

t/t-worktree.sh

@@ -11,6 +11,10 @@ if [ "$IS_WINDOWS" -eq 1 ]; then
   export MSYS2_ENV_CONV_EXCL="GIT_LFS_TEST_DIR"
 fi
 
+# The "git lfs env" command should ignore this environment variable
+# despite the "GIT_" strings in its name and value.
+export TEST_GIT_EXAMPLE="GIT_EXAMPLE"
+
 begin_test "git worktree"
 (
     set -e

t/testenv.sh

@@ -152,15 +152,13 @@ GIT_CONFIG_NOSYSTEM=1
 GIT_TERMINAL_PROMPT=0
 GIT_SSH=lfs-ssh-echo
 GIT_TEMPLATE_DIR="$(native_path "$ROOTDIR/t/fixtures/templates")"
-APPVEYOR_REPO_COMMIT_MESSAGE="test: env test should look for GIT_SSH too"
 LC_ALL=C
 
 export CREDSDIR
 export GIT_LFS_FORCE_PROGRESS
 export GIT_CONFIG_NOSYSTEM
 export GIT_SSH
 export GIT_TEMPLATE_DIR
-export APPVEYOR_REPO_COMMIT_MESSAGE
 export LC_ALL
 
 # Don't fail if run under git rebase -x.

t/testhelpers.sh

@@ -433,12 +433,16 @@ clone_repo() {
   local reponame="$1"
   local dir="$2"
   echo "clone local git repository $reponame to $dir"
-  out=$(git clone "$GITSERVER/$reponame" "$dir" 2>&1)
+  git clone "$GITSERVER/$reponame" "$dir" 2>&1 | tee clone.log
+
+  if [ "0" -ne "${PIPESTATUS[0]}" ]; then
+    return 1
+  fi
+
   cd "$dir"
+  mv ../clone.log .
 
   git config credential.helper lfstest
-  echo "$out" > clone.log
-  echo "$out"
 }
 
 # clone_repo_url clones a Git repository to the subdirectory $dir under $TRASHDIR.
@@ -449,12 +453,16 @@ clone_repo_url() {
   local repo="$1"
   local dir="$2"
   echo "clone git repository $repo to $dir"
-  out=$(git clone "$repo" "$dir" 2>&1)
+  git clone "$repo" "$dir" 2>&1 | tee clone.log
+
+  if [ "0" -ne "${PIPESTATUS[0]}" ]; then
+    return 1
+  fi
+
   cd "$dir"
+  mv ../clone.log .
 
   git config credential.helper lfstest
-  echo "$out" > clone.log
-  echo "$out"
 }
 
 # clone_repo_ssl clones a repository from the test Git server to the subdirectory
@@ -466,13 +474,16 @@ clone_repo_ssl() {
   local reponame="$1"
   local dir="$2"
   echo "clone local git repository $reponame to $dir"
-  out=$(git clone "$SSLGITSERVER/$reponame" "$dir" 2>&1)
+  git clone "$SSLGITSERVER/$reponame" "$dir" 2>&1 | tee clone_ssl.log
+
+  if [ "0" -ne "${PIPESTATUS[0]}" ]; then
+    return 1
+  fi
+
   cd "$dir"
+  mv ../clone_ssl.log .
 
   git config credential.helper lfstest
-
-  echo "$out" > clone_ssl.log
-  echo "$out"
 }
 
 # clone_repo_clientcert clones a repository from the test Git server to the subdirectory
@@ -484,26 +495,16 @@ clone_repo_clientcert() {
   local reponame="$1"
   local dir="$2"
   echo "clone $CLIENTCERTGITSERVER/$reponame to $dir"
-  set +e
-  out=$(git clone "$CLIENTCERTGITSERVER/$reponame" "$dir" 2>&1)
-  res="${PIPESTATUS[0]}"
-  set -e
-
-  if [ "0" -eq "$res" ]; then
-    cd "$dir"
-    echo "$out" > clone_client_cert.log
+  git clone "$CLIENTCERTGITSERVER/$reponame" "$dir" 2>&1 | tee clone_client_cert.log
 
-    git config credential.helper lfstest
-    return 0
+  if [ "0" -ne "${PIPESTATUS[0]}" ]; then
+    return 1
   fi
 
-  echo "$out" > clone_client_cert.log
-  if [ $(grep -c "NSInvalidArgumentException" clone_client_cert.log) -gt 0 ]; then
-    echo "client-cert-mac-openssl" > clone_client_cert.log
-    return 0
-  fi
+  cd "$dir"
+  mv ../clone_client_cert.log .
 
-  return 1
+  git config credential.helper lfstest
 }
 
 # setup_remote_repo_with_file creates a remote repo, clones it locally, commits