This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new ffc737ffb00 SOLR-16481: Upgrade Bats to 1.8.0 (#1091)
ffc737ffb00 is described below
commit ffc737ffb00dcf2f93a6f02e5af00477116bf15c
Author: Kevin Risden <[email protected]>
AuthorDate: Wed Oct 19 23:31:54 2022 -0400
SOLR-16481: Upgrade Bats to 1.8.0 (#1091)
---
solr/CHANGES.txt | 2 ++
solr/packaging/build.gradle | 8 +++++---
solr/packaging/test/bats_helper.bash | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7c5a8aabe4d..e8eb5f690a3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -57,6 +57,8 @@ Other Changes
* SOLR-16150: Embedded ZK Server used for zkRun should advertise itself on
specific bound interfaces instead of
generically on localhost. (Mike Drob)
+* SOLR-16481: Upgrade Bats to 1.8.0 (Kevin Risden)
+
================== 9.1.0 ==================
New Features
diff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradle
index 095c9ccb6ca..7c4157bf6fa 100644
--- a/solr/packaging/build.gradle
+++ b/solr/packaging/build.gradle
@@ -159,15 +159,17 @@ assemble.dependsOn installDist
task downloadBats(type: NpmTask) {
group = 'Build Dependency Download'
- args = ["install", "bats",
- "ztombol/bats-support",
- "ztombol/bats-assert",
+ args = ["install", "[email protected]",
+ "ztombol/bats-support#v0.2.0",
+ "ztombol/bats-assert#v0.3.0",
+ "ztombol/bats-file#v0.2.0",
]
inputs.files("${project.ext.nodeProjectDir}/package.json")
outputs.dir("${project.ext.nodeProjectDir}/node_modules/bats")
outputs.dir("${project.ext.nodeProjectDir}/node_modules/bats-support")
outputs.dir("${project.ext.nodeProjectDir}/node_modules/bats-assert")
+ outputs.dir("${project.ext.nodeProjectDir}/node_modules/bats-file")
}
task integrationTests(type: BatsTask) {
diff --git a/solr/packaging/test/bats_helper.bash
b/solr/packaging/test/bats_helper.bash
index d408af72808..9f7b50da900 100644
--- a/solr/packaging/test/bats_helper.bash
+++ b/solr/packaging/test/bats_helper.bash
@@ -20,7 +20,7 @@
# The SOLR_HOME directory will be cleared when the next test file is
executed.
# - "setup" should use "common_setup" if a Solr process is NOT being started
in that same "setup" function.
common_setup() {
- bats_require_minimum_version 1.5.0
+ bats_require_minimum_version 1.8.0
if [ -z ${BATS_LIB_PREFIX:-} ]; then
# Debugging help, if you want to run bats directly, try to detect
where libraries might be
@@ -31,6 +31,7 @@ common_setup() {
load "${BATS_LIB_PREFIX}/bats-support/load.bash"
load "${BATS_LIB_PREFIX}/bats-assert/load.bash"
+ load "${BATS_LIB_PREFIX}/bats-file/load.bash"
PATH="${SOLR_TIP:-.}/bin:$PATH"
export SOLR_ULIMIT_CHECKS=false
