refactoring

yandex · Mar 18, 2024 · 3a86158 · 3a86158
1 parent 50f7070
commit 3a86158
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 77 deletions.
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -11,79 +11,79 @@ ody-start
 /gorm/test.sh
 ody-stop
 
-# # odyssey rule-address test
-# /rule-address/test.sh
-# if [ $? -eq 1 ]
-# then
-# 	exit 1
-# fi
-
-# # odyssey target session attrs test
-# /tsa/tsa.sh
-# if [ $? -eq 1 ]
-# then
-# 	exit 1
-# fi
-
-# ody-start
-# /config-validation
-# ody-stop
-
-# #ldap
-# /ldap/test_ldap.sh
-# if [ $? -eq 1 ]
-# then
-# 	exit 1
-# fi
-
-# # scram
-# /scram/test_scram.sh
-# if [ $? -eq 1 ]
-# then
-# 	exit 1
-# fi
-
-# # auth query
-# /auth_query/test_auth_query.sh
-# if [ $? -eq 1 ]
-# then
-# 	exit 1
-# fi
-
-# # odyssey hba test
-# /hba/test.sh
-# if [ $? -eq 1 ]
-# then
-# 	exit 1
-# fi
-
-# #prepared statements in transaction pooling
-# /usr/bin/odyssey /etc/odyssey/pstmts.conf
-# sleep 1
-# /pstmts-test
-
-# ody-stop
-
-# # lag polling
-# /lagpolling/test-lag.sh
-# if [ $? -eq 1 ]
-# then
-# 	exit 1
-# fi
-
-# /usr/bin/odyssey-asan /etc/odyssey/odyssey.conf
-# ody-stop
-
-# # TODO: rewrite
-# #/shell-test/test.sh
-# /shell-test/console_role_test.sh
-# /shell-test/parse_pg_options_test.sh
-# /shell-test/override_pg_options_test.sh
-# /shell-test/pool_size_test.sh
-# ody-stop
-
-# ody-start
-# /ody-integration-test
-# ody-stop
+# odyssey rule-address test
+/rule-address/test.sh
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+
+# odyssey target session attrs test
+/tsa/tsa.sh
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+
+ody-start
+/config-validation
+ody-stop
+
+#ldap
+/ldap/test_ldap.sh
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+
+# scram
+/scram/test_scram.sh
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+
+# auth query
+/auth_query/test_auth_query.sh
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+
+# odyssey hba test
+/hba/test.sh
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+
+#prepared statements in transaction pooling
+/usr/bin/odyssey /etc/odyssey/pstmts.conf
+sleep 1
+/pstmts-test
+
+ody-stop
+
+# lag polling
+/lagpolling/test-lag.sh
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+
+/usr/bin/odyssey-asan /etc/odyssey/odyssey.conf
+ody-stop
+
+# TODO: rewrite
+#/shell-test/test.sh
+/shell-test/console_role_test.sh
+/shell-test/parse_pg_options_test.sh
+/shell-test/override_pg_options_test.sh
+/shell-test/pool_size_test.sh
+ody-stop
+
+ody-start
+/ody-integration-test
+ody-stop
 
 teardown
diff --git a/docker/gorm/test.sh b/docker/gorm/test.sh
@@ -1,4 +1,4 @@
-git clone https://github.com/pg-sharding/gorm-spqr.git /gorm/gorm-spqr
+# git clone https://github.com/pg-sharding/gorm-spqr.git /gorm/gorm-spqr
 docker build -t gorm-tests /gorm/gorm-spqr
-rm -rf /gorm/gorm-spqr
-docker run -e DB_HOST='odyssey' -e DB_PORT=6432 -e DB_USER='spqr-console' -e DB_NAME='spqr-console' -e EXTRA_PARAMS='client_encoding=UTF8' --network=odyssey_od_net gorm-tests
+# rm -rf /gorm/gorm-spqr
+docker run -e DB_HOST='odyssey' -e DB_PORT=6432 -e DB_USER='spqr-console' -e DB_NAME='spqr-console' --network=odyssey_od_net gorm-tests