diff options
author | Malfurious <m@lfurio.us> | 2021-03-24 02:59:48 -0400 |
---|---|---|
committer | Malfurious <m@lfurio.us> | 2021-03-24 02:59:48 -0400 |
commit | a9737ee899dcfee46d8765c1b534b8c9df68cbe6 (patch) | |
tree | 2e0a68fbec1d86915e37c1db1c7768504f6e01e0 /test-branches.sh | |
parent | fee615fe9fd3a535bd6dfd8fcf01c3dee9300b6c (diff) | |
parent | 51bd4bc64308f1eb8e1aab20d6f3280549098267 (diff) | |
download | git-sonar-a9737ee899dcfee46d8765c1b534b8c9df68cbe6.tar.gz git-sonar-a9737ee899dcfee46d8765c1b534b8c9df68cbe6.zip |
Merge branch 'hotfix/unittests' of https://github.com/cbandera/git-radar
Merge pending pull request #67 of upstream git-radar project from user
cbandera. They write:
This is a pull request to fix issue #38. As it turns out, some built in
commands behave differently on Mac OS X and Linux.
In order to run the tests on Linux, I have added switch statements at
some points to call the functions with the respective syntax.
Also I realized, that the tests only worked for me when I set the
following options:
git config --global push.default simple
git config --global branch.autosetuprebase never
But that's probably just because these should be the defaults. I
normally have them set to something else...
Diffstat (limited to '')
-rwxr-xr-x | test-branches.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test-branches.sh b/test-branches.sh index 5c33d23..891a819 100755 --- a/test-branches.sh +++ b/test-branches.sh @@ -1,3 +1,4 @@ +#!/bin/bash scriptDir="$(cd "$(dirname "$0")"; pwd)" source "$scriptDir/radar-base.sh" @@ -96,8 +97,13 @@ test_remote_branch_name_quiet_when_not_in_repo() { echo "$debug_output" - assertEquals " 0" "$usages" - + if [[ $OSTYPE == darwin* ]];then + expected=" 0" + else + expected="0" + fi; + assertEquals "$expected" "$usages" + rm_tmp } |