Merge pull request #1394 from zhao-li/fix_tests

fix broken tests
pull/1398/head
Nils Winkler 2019-07-12 08:32:05 +02:00 committed by GitHub
commit cb000d5b40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions

View File

@ -115,6 +115,8 @@ setup_repo_with_upstream() {
git add file git add file
git stash git stash
SCM_GIT_SHOW_STASH_INFO=true
git_prompt_vars git_prompt_vars
assert_equal "$SCM_BRANCH" "${pre} {1}" assert_equal "$SCM_BRANCH" "${pre} {1}"
@ -320,6 +322,8 @@ setup_repo_with_upstream() {
echo "line2" >> file1 echo "line2" >> file1
git add file1 git add file1
SCM_GIT_SHOW_DETAILS=true
git_prompt_vars git_prompt_vars
assert_equal "$SCM_BRANCH" "${pre} S:1" assert_equal "$SCM_BRANCH" "${pre} S:1"
assert_equal "$SCM_STATE" " ✗" assert_equal "$SCM_STATE" " ✗"