mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 09:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-33750: Sync smoke test from newer version of Debian Salsa-CI

Browse source 
For making smoke test work sync current Debian Salsa-CI version
for making needed changes
This commit is contained in:
Tuukka Pasanen 2024-05-10 10:09:03 +03:00 • committed by Daniel Black
parent 4c1e4ba62e
commit 89a638f4b8
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
debian/tests/smoke vendored
View file

@ -45,28 +45,29 @@ else
systemctl restart mariadb systemctl restart mariadb
fi fi
mariadb <<EOT mysql <<EOT
CREATE DATABASE testdatabase; CREATE DATABASE testdatabase;
CREATE USER 'testuser'@'localhost' identified by 'testpassword'; CREATE USER 'testuser'@'localhost' identified by 'testpassword';
GRANT ALL ON testdatabase.* TO 'testuser'@'localhost'; GRANT ALL ON testdatabase.* TO 'testuser'@'localhost';
EOT EOT
mariadb testdatabase <<EOT mysql testdatabase <<EOT
CREATE TABLE foo (bar INTEGER); CREATE TABLE foo (bar INTEGER);
INSERT INTO foo (bar) VALUES (41); INSERT INTO foo (bar) VALUES (41);
EOT EOT
result=$(echo 'SELECT bar+1 FROM foo;'|mariadb --batch --skip-column-names --user=testuser --password=testpassword testdatabase) result=$(echo 'SELECT bar+1 FROM foo;'|mysql --batch --skip-column-names --user=testuser --password=testpassword testdatabase)
if [ "$result" != "42" ]; then if [ "$result" != "42" ]
then
echo "Unexpected result" >&2 echo "Unexpected result" >&2
exit 1 exit 1
fi fi
mariadb --user=testuser --password=testpassword testdatabase <<EOT mysql --user=testuser --password=testpassword testdatabase <<EOT
DROP TABLE foo; DROP TABLE foo;
EOT EOT
mariadb <<EOT mysql <<EOT
DROP DATABASE testdatabase; DROP DATABASE testdatabase;
DROP USER 'testuser'@'localhost'; DROP USER 'testuser'@'localhost';
EOT EOT
@ -114,5 +115,9 @@ then
fi fi
done done
else else
dpkg-query -W $plugin && exit 1 if dpkg-query -W $plugin
then
echo "Error: Plugin $plugin was found even though it should not exist on a 32-bit and little-endian system"
exit 1
fi
fi fi

5
debian/tests/upstream vendored
View file

@ -60,12 +60,15 @@ cp -v "$MTR_SKIP_TEST_LIST" "$AUTOPKGTEST_ARTIFACTS"
cd /usr/share/mysql/mysql-test cd /usr/share/mysql/mysql-test
echo "starting mysql-test-tun.pl..." echo "starting mysql-test-tun.pl..."
export MTR_PRINT_CORE=detailed export MTR_PRINT_CORE=detailed
# The $MTR_ARGUMENTS_APPEND is intentionally used to pass in extra arguments
# shellcheck disable=SC2086
eatmydata perl -I. ./mysql-test-run.pl \ eatmydata perl -I. ./mysql-test-run.pl \
--force --testcase-timeout=120 --suite-timeout=540 --retry=3 \ --force --testcase-timeout=120 --suite-timeout=540 --retry=3 \
--verbose-restart --max-save-core=1 --max-save-datadir=1 \ --verbose-restart --max-save-core=1 --max-save-datadir=1 \
--parallel=auto --skip-rpl --suite=main \ --parallel=auto --skip-rpl --suite=main \
--skip-test-list="$MTR_SKIP_TEST_LIST" \ --skip-test-list="$MTR_SKIP_TEST_LIST" \
--vardir="$WORKDIR/var" --tmpdir="$WORKDIR/tmp" \ --vardir="$WORKDIR/var" --tmpdir="$WORKDIR/tmp" \
--xml-report="$AUTOPKGTEST_ARTIFACTS/mysql-test-run-junit.xml" --xml-report="$AUTOPKGTEST_ARTIFACTS/mysql-test-run-junit.xml" \
$MTR_ARGUMENTS_APPEND \
"$@" 2>&1 "$@" 2>&1
echo "run: OK" echo "run: OK"