Skip to content

Commit 955ce58

Browse files
committed
Moved tika start/stop into test_extraction.bats again
1 parent 60c7565 commit 955ce58

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

solr/packaging/test/bats_helper.bash

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,3 @@ apply_extract_handler() {
135135
return 1
136136
fi
137137
}
138-
139-
start_tika_server_docker() {
140-
if command -v docker >/dev/null 2>&1 && docker info >/dev/null 2>&1; then
141-
export TIKA_PORT=$((SOLR_PORT+5))
142-
docker run --rm -p ${TIKA_PORT}:9998 --name bats_tika -d apache/tika:3.2.3.0-full >/dev/null 2>&1 || true
143-
echo "Tika Server started on port ${TIKA_PORT}" >&3
144-
else
145-
export DOCKER_UNAVAILABLE=1
146-
echo "WARNING: Docker not available (CLI missing or daemon not running); Tika-dependent tests will be bypassed and marked as passed." >&3
147-
fi
148-
}
149-
150-
stop_tika_server_docker() {
151-
if command -v docker >/dev/null 2>&1 && docker info >/dev/null 2>&1; then
152-
echo "Stopping Tika Server container" >&3
153-
docker stop bats_tika >/dev/null 2>&1 || true
154-
fi
155-
}

solr/packaging/test/test_extraction.bats

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,21 @@
1919
load bats_helper
2020

2121
setup_file() {
22-
start_tika_server_docker
22+
if command -v docker >/dev/null 2>&1 && docker info >/dev/null 2>&1; then
23+
export TIKA_PORT=$((SOLR_PORT+5))
24+
docker run --rm -p ${TIKA_PORT}:9998 --name bats_tika -d apache/tika:3.2.3.0-full >/dev/null 2>&1 || true
25+
echo "Tika Server started on port ${TIKA_PORT}" >&3
26+
else
27+
export DOCKER_UNAVAILABLE=1
28+
echo "WARNING: Docker not available (CLI missing or daemon not running); Tika-dependent tests will be bypassed and marked as passed." >&3
29+
fi
2330
}
2431

2532
teardown_file() {
26-
stop_tika_server_docker
33+
if command -v docker >/dev/null 2>&1 && docker info >/dev/null 2>&1; then
34+
echo "Stopping Tika Server container" >&3
35+
docker stop bats_tika >/dev/null 2>&1 || true
36+
fi
2737
}
2838

2939
setup() {

0 commit comments

Comments
 (0)