Skip to content

Commit e281e4a

Browse files
committed
ci: update n2st submodule to latest and minor refactor
- Added `.run` configuration file for executing Bats tests with `DOCKER_CONTEXT=desktop-linux` - Modified `tnp::run_n2st_testing_tools` to use `pushd` and `popd` - Removed DOCKER_CONTEXT environment variable from existing run configuration
1 parent 8f7b324 commit e281e4a

4 files changed

+23
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="run bats tests › 'tests' (all | DOCKER_CONTEXT=desktop-linux V2)" type="ShConfigurationType" folderName="[TNP] A | bats tests">
3+
<option name="SCRIPT_TEXT" value="" />
4+
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
5+
<option name="SCRIPT_PATH" value="$PROJECT_DIR$/tests/run_bats_core_test_in_n2st.tnp.bash" />
6+
<option name="SCRIPT_OPTIONS" value="tests/tests_bats" />
7+
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
8+
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
9+
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
10+
<option name="INTERPRETER_PATH" value="/bin/zsh" />
11+
<option name="INTERPRETER_OPTIONS" value="" />
12+
<option name="EXECUTE_IN_TERMINAL" value="false" />
13+
<option name="EXECUTE_SCRIPT_FILE" value="true" />
14+
<envs>
15+
<env name="DOCKER_CONTEXT" value="desktop-linux" />
16+
</envs>
17+
<method v="2" />
18+
</configuration>
19+
</component>

.run/runBatsTestsAll.run.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
<option name="INTERPRETER_OPTIONS" value="" />
1212
<option name="EXECUTE_IN_TERMINAL" value="false" />
1313
<option name="EXECUTE_SCRIPT_FILE" value="true" />
14-
<envs>
15-
<env name="DOCKER_CONTEXT" value="desktop-linux" />
16-
</envs>
14+
<envs />
1715
<method v="2" />
1816
</configuration>
1917
</component>

tests/run_bats_core_test_in_n2st.tnp.bash

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ if [[ -z $PARAMS ]]; then
2121
fi
2222

2323
function tnp::run_n2st_testing_tools(){
24-
local TMP_CWD
25-
TMP_CWD=$(pwd)
24+
pushd "$(pwd)" >/dev/null || exit 1
2625

2726
# ....Project root logic.........................................................................
2827
TNP_ROOT=$(git rev-parse --show-toplevel)
@@ -55,7 +54,7 @@ export TNP_TEAMCITY_PR_SOURCE
5554
bash "${N2ST_PATH:?err}/tests/bats_testing_tools/run_bats_tests_in_docker.bash" $PARAMS
5655

5756
# ....Teardown...................................................................................
58-
cd "$TMP_CWD"
57+
popd >/dev/null || exit 1
5958
}
6059

6160
tnp::run_n2st_testing_tools

0 commit comments

Comments
 (0)