Skip to content

Commit c61d101

Browse files
committed
removed unnecessary DIR reference.
1 parent 0c6eb18 commit c61d101

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

tests/localhost.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DIR="$(dirname "$0")"
2020

2121
cd $DIR
2222

23-
source ${DIR}/environment.sh
23+
source environment.sh
2424

2525

2626
. install_role_dependencies.sh

tests/vagrant.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ DIR="$(dirname "$0")"
2424

2525
cd $DIR
2626

27-
source ${DIR}/environment.sh
27+
source environment.sh
2828

2929
# The filename of the Ansible playbook to be used on the test.
3030
# NOTE: PLAYBOOK must be the same value as defined in the Vagrantfile.
31-
PLAYBOOK="${DIR}/vagrant.yml"
31+
PLAYBOOK="vagrant.yml"
3232

3333
# A default inventory file is automatically generated by Vagrant @
3434
# INVENTORY=${DIR}/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
@@ -70,11 +70,9 @@ key="$1"
7070
shift
7171
done
7272

73-
DIR=$(dirname "$0")
74-
7573
if [[ ! -z ${PYTHON_VERSION} ]] && [[ ! -z ${ANSIBLE_VERSION} ]]; then
7674
echo '[INFO] loading Python / Ansible virtualenv...'
77-
VIRTUALENV="${DIR}/../.tox/py${PYTHON_VERSION}-ansible${ANSIBLE_VERSION}"
75+
VIRTUALENV="../.tox/py${PYTHON_VERSION}-ansible${ANSIBLE_VERSION}"
7876
VIRTUALENV_NAME="py${PYTHON_VERSION}-ansible${ANSIBLE_VERSION}"
7977
fi
8078

@@ -84,7 +82,7 @@ source ${VIRTUALENV}/bin/activate
8482
. install_role_dependencies.sh
8583

8684

87-
for box_yml in ${DIR}/host_vars/*.yml
85+
for box_yml in host_vars/*.yml
8886
do
8987
filename=$(basename "$box_yml")
9088
box=${filename%.*}
@@ -98,5 +96,5 @@ do
9896
. test_idempotence.sh
9997

10098
echo "[INFO] destroying ${box}..."
101-
#vagrant destroy -f $box
99+
# vagrant destroy -f $box
102100
done

0 commit comments

Comments
 (0)