Skip to content

Commit 5d6fab6

Browse files
committed
t/t-clone.sh: update progress meter message check
In commit db4e3b2 of PR git-lfs#2811 we updated the progress meter text of the Git LFS client from "Git LFS" to the more explicit "Uploading LFS objects" or "Downloading LFS objects". A large number of tests were changed in the same commit because they check the progress meter output in logs they capture from Git LFS operations. However, the "cloneSSL" test in our t/t-clone.sh test script was not updated because it has not actually run to completion for a long time, as described in git-lfs#5658, so it did not fail when the progress meter text changed. Due to a bug in the conditional used to check the TRAVIS variable, the test instead always exits early and declares success. We will address this problem in a subsequent commit in this PR, at which point the test will fail unless we adjust it to check for the same progress meter text as all our other tests, so we do that now. We also take the opportunity to add a similar check of the same progress meter message to the "clone ClientCert" test. This brings our tests in the t/t-clone.sh script into slightly closer alignment with each other, which should help ensure they stay consistent in the future. (Note that this test does not run to completion at the moment either, for the same reason as the "cloneSSL" test.)
1 parent 155a18e commit 5d6fab6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

t/t-clone.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ begin_test "cloneSSL"
145145
git lfs clone "$SSLGITSERVER/$reponame" "$newclonedir" 2>&1 | tee lfsclone.log
146146
assert_clean_status
147147
grep "Cloning into" lfsclone.log
148-
grep "Git LFS:" lfsclone.log
148+
grep "Downloading LFS objects:" lfsclone.log
149149
# should be no filter errors
150150
[ ! $(grep "filter" lfsclone.log) ]
151151
[ ! $(grep "error" lfsclone.log) ]
@@ -226,6 +226,7 @@ begin_test "clone ClientCert"
226226
rm -fr "$newclonedir"
227227
git lfs clone "$CLIENTCERTGITSERVER/$reponame" "$newclonedir" 2>&1 | tee lfsclone.log
228228
grep "Cloning into" lfsclone.log
229+
grep "Downloading LFS objects:" lfsclone.log
229230
# should be no filter errors
230231
[ ! $(grep "filter" lfsclone.log) ]
231232
[ ! $(grep "error" lfsclone.log) ]

0 commit comments

Comments
 (0)