From fda2da6a5bd468050d8ca0f18bde1c87929b2730 Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Fri, 31 Mar 2017 07:49:52 -0500 Subject: [PATCH] Fix tests that set local.hostname (#59) --- test/106_accept_config.bats | 6 +++--- test/108_accept_alt.bats | 4 ++-- test/113_accept_jinja_alt.bats | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/106_accept_config.bats b/test/106_accept_config.bats index f5311f6..d1ce805 100644 --- a/test/106_accept_config.bats +++ b/test/106_accept_config.bats @@ -143,12 +143,12 @@ setup() { #; write local attributes build_repo - for loption in class os host user; do + for loption in class os hostname user; do GIT_DIR="$T_DIR_REPO" git config "local.$loption" "custom_$loption" done #; run config - for loption in class os host user; do + for loption in class os hostname user; do run "${T_YADM_Y[@]}" config "local.$loption" #; validate status and output [ $status -eq 0 ] @@ -176,7 +176,7 @@ setup() { local linecount expected="[local]\n" linecount=1 - for loption in class os host user; do + for loption in class os hostname user; do #; update expected expected="$expected\t$loption = custom_$loption\n" ((linecount+=1)) diff --git a/test/108_accept_alt.bats b/test/108_accept_alt.bats index 6a2b299..004fd79 100644 --- a/test/108_accept_alt.bats +++ b/test/108_accept_alt.bats @@ -379,13 +379,13 @@ function test_alt() { echo " When the command 'alt' is provided and file matches only ##SYSTEM.HOST - after setting local.host + after setting local.hostname Report the linking Verify correct file is linked Exit with 0 " - GIT_DIR="$T_DIR_REPO" git config local.host custom_host + GIT_DIR="$T_DIR_REPO" git config local.hostname custom_host test_alt 'override_host' 'false' '' } diff --git a/test/113_accept_jinja_alt.bats b/test/113_accept_jinja_alt.bats index 0ca0d5a..7d7e259 100644 --- a/test/113_accept_jinja_alt.bats +++ b/test/113_accept_jinja_alt.bats @@ -169,7 +169,7 @@ function test_alt() { GIT_DIR="$T_DIR_REPO" git config local.os custom_system GIT_DIR="$T_DIR_REPO" git config local.user custom_user - GIT_DIR="$T_DIR_REPO" git config local.host custom_host + GIT_DIR="$T_DIR_REPO" git config local.hostname custom_host GIT_DIR="$T_DIR_REPO" git config local.class custom_class test_alt 'override_all' 'false' '' }