Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove test references to old CI #5615

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions t/t-askpass.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ begin_test "askpass: push with core.askPass"
(
set -e

if [ ! -z "$TRAVIS" ] ; then
# This test is known to be broken on Travis, so we skip it if the $TRAVIS
# environment variable is set.
#
# See: https://github.com/git-lfs/git-lfs/pull/2500 for more.
exit 0
fi

reponame="askpass-with-config"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
Expand Down Expand Up @@ -71,14 +63,6 @@ begin_test "askpass: push with SSH_ASKPASS"
(
set -e

if [ ! -z "$TRAVIS" ] ; then
# This test is known to be broken on Travis, so we skip it if the $TRAVIS
# environment variable is set.
#
# See: https://github.com/git-lfs/git-lfs/pull/2500 for more.
exit 0
fi

reponame="askpass-with-ssh-environ"
setup_remote_repo "$reponame"
clone_repo "$reponame" "$reponame"
Expand Down
11 changes: 1 addition & 10 deletions t/t-clone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ end_test
begin_test "cloneSSL"
(
set -e
if $TRAVIS; then
echo "Skipping SSL tests, Travis has weird behaviour in validating custom certs, test locally only"
exit 0
fi

reponame="test-cloneSSL"
setup_remote_repo "$reponame"
Expand Down Expand Up @@ -123,9 +119,8 @@ begin_test "cloneSSL"

newclonedir="testcloneSSL1"
git lfs clone "$SSLGITSERVER/$reponame" "$newclonedir" 2>&1 | tee lfsclone.log
assert_clean_status
(cd "$newclonedir" && assert_clean_status)
grep "Cloning into" lfsclone.log
grep "Git LFS:" lfsclone.log
# should be no filter errors
[ ! $(grep "filter" lfsclone.log) ]
[ ! $(grep "error" lfsclone.log) ]
Expand All @@ -150,10 +145,6 @@ end_test
begin_test "clone ClientCert"
(
set -e
if $TRAVIS; then
echo "Skipping SSL tests, Travis has weird behaviour in validating custom certs, test locally only"
exit 0
fi

reponame="test-cloneClientCert"
setup_remote_repo "$reponame"
Expand Down
2 changes: 0 additions & 2 deletions t/testenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,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.
Expand Down
Loading