fixes for dolt Docker images and ORM integration tests (#4871)

This commit is contained in:
jennifersp
2022-11-28 14:08:36 -08:00
committed by GitHub
parent 7c51dd0286
commit 4fd39b7309
3 changed files with 6 additions and 5 deletions

View File

@@ -13,4 +13,5 @@ RUN tar zxvf dolt-linux-${BUILDARCH}.tar.gz && \
cp dolt-linux-${BUILDARCH}/bin/dolt /usr/local/bin && \
rm -rf dolt-linux-${BUILDARCH} dolt-linux-${BUILDARCH}.tar.gz
WORKDIR /var/lib/dolt
ENTRYPOINT ["tini", "--", "/usr/local/bin/dolt"]

View File

@@ -58,7 +58,7 @@ get_config_file_path_if_exists() {
FILE_TYPE=$2
if [ -d "$CONFIG_DIR" ]; then
mysql_note "Checking for config provided in $CONFIG_DIR"
number_of_files_found=( `find .$CONFIG_DIR -type f -name "*.$FILE_TYPE" | wc -l` )
number_of_files_found=( `find $CONFIG_DIR -type f -name "*.$FILE_TYPE" | wc -l` )
if [ $number_of_files_found -gt 1 ]; then
CONFIG_PROVIDED=
mysql_warn "multiple config file found in $CONFIG_DIR, using default config"

View File

@@ -50,7 +50,7 @@ teardown() {
@test "Prisma ORM smoke test" {
mysql --protocol TCP -u dolt -e "create database dolt;"
cd prisma
cd $BATS_TEST_DIRNAME/prisma
npm install
npx -c "prisma migrate dev --name init"
}
@@ -72,7 +72,7 @@ teardown() {
@test "TypeORM smoke test" {
mysql --protocol TCP -u dolt -e "create database dolt;"
cd typeorm
cd $BATS_TEST_DIRNAME/typeorm
npm install
npm start
}
@@ -82,7 +82,7 @@ teardown() {
@test "MikroORM smoke test" {
mysql --protocol TCP -u dolt -e "create database dolt;"
cd mikro-orm
cd $BATS_TEST_DIRNAME/mikro-orm
npm install
npm start
}
@@ -93,7 +93,7 @@ teardown() {
# need to create tables for it before running the test
mysql --protocol TCP -u dolt -e "create database dolt; use dolt; create table STUDENT (id INT NOT NULL auto_increment PRIMARY KEY, first_name VARCHAR(30) NOT NULL, last_name VARCHAR(30) NOT NULL, section VARCHAR(30) NOT NULL);"
cd hibernate/DoltHibernateSmokeTest
cd $BATS_TEST_DIRNAME/hibernate/DoltHibernateSmokeTest
mvn clean install
mvn clean package
mvn exec:java