Skip to content

Commit 7b39440

Browse files
committed
mk-oracle: stage the whole fixture tree for remote component tests
The remote component-test runner shipped only the test binaries and tnsnames.ora, so five tests in test_ora_no_db found no fixtures and failed on remote hosts. TESTS: Manual. Ran the no-DB component tests through the remote runner on Solaris and AIX: 31 passed, 0 failed. Before: 26 passed, 5 failed. Change-Id: I282311935d9a1c8c5a94fdb8a9c39b084004f7ac
1 parent 1c45694 commit 7b39440

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

  • packages/mk-oracle

packages/mk-oracle/run

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,18 +348,19 @@ run_test_component_remote_host() {
348348
fi
349349

350350
: "${TEST_BINARIES:=test_ora_no_db_test test_ora_discovery_test test_ora_with_db_test}"
351-
# NOTE: create test folder and directory structure emulating real deployment too
351+
# Create test folder and directory structure emulating real deployment
352352
# shellcheck disable=SC2086,SC2087,SC2029
353353
ssh $SSH_ARGS "${HOST_ADDRESS}" <<EOF
354354
set -e
355355
mkdir -p "${TEST_BINARY_REMOTE_PATH}/runtimes/plugins/packages/mk-oracle"
356-
mkdir -p "${TEST_BINARY_REMOTE_PATH}/tests/files/tns"
356+
mkdir -p "${TEST_BINARY_REMOTE_PATH}/tests"
357+
: >"${TEST_BINARY_REMOTE_PATH}/runtimes/plugins/packages/mk-oracle/libclntsh.so"
357358
EOF
358359
# copy Oracle DB plug-in test binaries and test data to the remote-host
359360
# shellcheck disable=SC2086
360361
scp $SSH_ARGS ${TEST_BINARIES} "${HOST_ADDRESS}":"${TEST_BINARY_REMOTE_PATH}/"
361362
# shellcheck disable=SC2086
362-
scp $SSH_ARGS tests/files/tns/tnsnames.ora "${HOST_ADDRESS}":"${TEST_BINARY_REMOTE_PATH}/tests/files/tns/"
363+
scp $SSH_ARGS -r tests/files "${HOST_ADDRESS}":"${TEST_BINARY_REMOTE_PATH}/tests/"
363364
# The heredoc below is expanded locally; an unset ORACLE_HOME must stay
364365
# unset on the remote host too, so its export is prepared here.
365366
ORACLE_HOME_EXPORT=""

0 commit comments

Comments
 (0)