Skip to content

Commit

Permalink
t2
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexSkrypnyk committed Feb 13, 2024
1 parent f5affe3 commit 5f17a3b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .drevops/tests/bats/_helper.bash
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,16 @@ setup() {
# Directory where the application may store it's temporary files.
export APP_TMP_DIR="${BUILD_DIR}/tmp"

# Use unique installer checkout dir to allow multiple calls of this function
# with a single test.
INSTALLER_CHECKOUT_DIR="${APP_TMP_DIR}/installer_$(random_string)"

fixture_prepare_dir "${BUILD_DIR}"
fixture_prepare_dir "${CURRENT_PROJECT_DIR}"
fixture_prepare_dir "${DST_PROJECT_DIR}"
fixture_prepare_dir "${LOCAL_REPO_DIR}"
fixture_prepare_dir "${APP_TMP_DIR}"
fixture_prepare_dir "${INSTALLER_CHECKOUT_DIR}"

##
## Phase 4: Application variables setup.
Expand Down Expand Up @@ -960,11 +965,6 @@ run_install_quiet() {
fixture_prepare_dir "${DREVOPS_INSTALL_TMP_DIR}"
export DREVOPS_INSTALL_TMP_DIR

# Use unique installer checkout dir to allow multiple calls of this function
# with a single test.
INSTALLER_CHECKOUT_DIR="${APP_TMP_DIR}/installer_$(random_string)"
fixture_prepare_dir "${INSTALLER_CHECKOUT_DIR}"

# Tests are using demo database and 'ahoy download-db' command, so we need
# to set the CURL DB to test DB.
#
Expand Down
2 changes: 1 addition & 1 deletion .drevops/tests/bats/update-drevops.bats
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ load _helper.bash
# Enforce debugging of the install script.
export DREVOPS_INSTALL_DEBUG=1
# Override install script with currently tested one to be called from ./scripts/drevops/update-drevops.sh
export DREVOPS_INSTALLER_URL="file://${ROOT_DIR}/.drevops/installer/.build/install.phar"
export DREVOPS_INSTALLER_URL="file://${INSTALLER_CHECKOUT_DIR}/install.php"
# shellcheck disable=SC2059
run ahoy update-drevops
assert_success
Expand Down

0 comments on commit 5f17a3b

Please sign in to comment.