fix(tools,test): wrong user
This commit is contained in:
@@ -35,7 +35,7 @@ docker cp "$PROJECT_DIR/$SQL_FILE" "$CONTAINER:/tmp/pg_morbac_test/"
|
|||||||
docker cp "$PROJECT_DIR/tests" "$CONTAINER:/tmp/pg_morbac_test/"
|
docker cp "$PROJECT_DIR/tests" "$CONTAINER:/tmp/pg_morbac_test/"
|
||||||
docker cp "$SCRIPT_DIR/test.sh" "$CONTAINER:/tmp/pg_morbac_test/tools/"
|
docker cp "$SCRIPT_DIR/test.sh" "$CONTAINER:/tmp/pg_morbac_test/tools/"
|
||||||
|
|
||||||
docker exec -w /tmp/pg_morbac_test "$CONTAINER" bash tools/test.sh "$DB" "$SQL_FILE"
|
docker exec -u postgres -w /tmp/pg_morbac_test "$CONTAINER" bash tools/test.sh "$DB" "$SQL_FILE" postgres
|
||||||
|
|
||||||
docker exec "$CONTAINER" psql -U postgres -c "DROP DATABASE $DB" -q
|
docker exec "$CONTAINER" psql -U postgres -c "DROP DATABASE $DB" -q
|
||||||
docker exec "$CONTAINER" rm -rf /tmp/pg_morbac_test
|
docker exec "$CONTAINER" rm -rf /tmp/pg_morbac_test
|
||||||
|
|||||||
+6
-5
@@ -1,12 +1,13 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# test.sh - Run tests against the PostgreSQL extension using psql
|
# test.sh - Run tests against the PostgreSQL extension using psql
|
||||||
# Usage: ./test.sh [database_name] [sql_file]
|
# Usage: ./test.sh [database_name] [sql_file] [user]
|
||||||
|
|
||||||
set -e # Exit immediately if a command exits with a non-zero status
|
set -e # Exit immediately if a command exits with a non-zero status
|
||||||
|
|
||||||
DB="${1:-morbac_test}"
|
DB="${1:-morbac_test}"
|
||||||
SQL_FILE="${2:-pg_morbac.sql}"
|
SQL_FILE="${2:-pg_morbac.sql}"
|
||||||
|
USER="${3:-postgres}"
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||||
PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||||
@@ -23,7 +24,7 @@ if [ ! -d "$TEST_DIR" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! psql -d "$DB" -c '\q'; then
|
if ! psql -U "$USER" -d "$DB" -c '\q'; then
|
||||||
echo "Error: cannot connect to database: $DB" >&2
|
echo "Error: cannot connect to database: $DB" >&2
|
||||||
echo "Ensure the database exists and is accessible" >&2
|
echo "Ensure the database exists and is accessible" >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -31,17 +32,17 @@ fi
|
|||||||
|
|
||||||
echo "Testing $SQL_FILE on database $DB"
|
echo "Testing $SQL_FILE on database $DB"
|
||||||
|
|
||||||
psql -d "$DB" -f "$PROJECT_DIR/$SQL_FILE" -q
|
psql -U "$USER" -d "$DB" -f "$PROJECT_DIR/$SQL_FILE" -q
|
||||||
|
|
||||||
if [ -f "$TEST_DIR/00_setup.sql" ]; then
|
if [ -f "$TEST_DIR/00_setup.sql" ]; then
|
||||||
psql -d "$DB" -f "$TEST_DIR/00_setup.sql" -q
|
psql -U "$USER" -d "$DB" -f "$TEST_DIR/00_setup.sql" -q
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for test_file in "$TEST_DIR"/[0-9][0-9]_*.sql; do
|
for test_file in "$TEST_DIR"/[0-9][0-9]_*.sql; do
|
||||||
if [ -f "$test_file" ]; then
|
if [ -f "$test_file" ]; then
|
||||||
test_name=$(basename "$test_file" .sql)
|
test_name=$(basename "$test_file" .sql)
|
||||||
echo "Running: $test_name"
|
echo "Running: $test_name"
|
||||||
psql -d "$DB" -f "$test_file" -q
|
psql -U "$USER" -d "$DB" -f "$test_file" -q
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user