Segregate stress test based on TPC-DS from common ones

Author: maksm90

.travis.yml

@@ -18,17 +18,14 @@ notifications:
         on_failure: always
 
 env:
-    - PG_VERSION=12 LEVEL=hardcore
+    - PG_VERSION=12 LEVEL=hardcore USE_TPCDS=1
     - PG_VERSION=12
-    - PG_VERSION=11 LEVEL=hardcore
+    - PG_VERSION=11 LEVEL=hardcore USE_TPCDS=1
     - PG_VERSION=11
-    - PG_VERSION=10 LEVEL=hardcore
+    - PG_VERSION=10 LEVEL=hardcore USE_TPCDS=1
     - PG_VERSION=10
-    - PG_VERSION=9.6 LEVEL=hardcore
+    - PG_VERSION=9.6 LEVEL=hardcore USE_TPCDS=1
     - PG_VERSION=9.6
-    - PG_VERSION=12 LEVEL=stress
-    - PG_VERSION=11 LEVEL=stress
-    - PG_VERSION=10 LEVEL=stress
 
 matrix:
     allow_failures:

README.md

@@ -47,11 +47,13 @@ python tests/pg_qs_test_runner.py [OPTION]...
 * *- -database* --- database name, default value is *postgres*
 * *- -user* --- user name, default value is *postgres*
 * *- -password* --- user's password, default value is empty
+* *- -tpc-ds* --- runs only stress tests on TPC-DS benchmark
 
 Or run all tests in `Docker` using:
 
 ```shell
-export LEVEL=stress
+export LEVEL=hardcore
+export USE_TPCDS=1
 export PG_VERSION=12
 
 docker-compose build

run_tests.sh

@@ -147,6 +147,9 @@ python3 -m venv /tmp/env && source /tmp/env/bin/activate &&
 pip install -r tests/requirements.txt
 set -e #exit virtualenv with error code
 python tests/pg_qs_test_runner.py --port $PGPORT
+if [ -n $USE_TPCDS ]; then
+	python tests/pg_qs_test_runner.py --port $PGPORT --tpc-ds
+fi
 deactivate
 set -x
 
@@ -170,4 +173,4 @@ gcov *.c *.h
 set +ux
 
 # send coverage stats to Codecov
-bash <(curl -s https://codecov.io/bash)
+bash <(curl -s https://codecov.io/bash)

tests/pg_qs_test_runner.py

@@ -32,7 +32,7 @@ class TeardownException(Exception): pass
 	'insert into bar select i, i%2=1 from generate_series(1, 500000) as i',
 	'analyze foo',
 	'analyze bar',
-	]
+]
 
 teardown_cmd = [
 	'drop table foo cascade',
@@ -82,27 +82,30 @@ def teardown(con):
 
 def main(config):
 	''' Main test function '''
+	conn_params = {
+			key:config.__dict__[key] for key in ('host', 'port', 'user', 'database', 'password')
+	}
 
-	con = psycopg2.connect(**config)
-	setup(con)
+	if config.use_tpcds:
+		print('Starting stress test')
+		test_tpc_ds(conn_params)
+		print('Stress finished successfully')
+		return
 
+	# run default tests
+	init_conn = psycopg2.connect(**conn_params)
+	setup(init_conn)
 	for i, test in enumerate(tests):
 		if test.__doc__:
 			descr = test.__doc__
 		else:
 			descr = 'test case %d' % (i+1)
 		print(("%s..." % descr))
 		sys.stdout.flush()
-		test(config)
+		test(conn_params)
 		print('ok!')
-
-	if os.environ['LEVEL'] == 'stress':
-		print('Starting stress test')
-		test_tpc_ds(config)
-		print('Stress finished successfully')
-
-	teardown(con)
-	con.close()
+	teardown(init_conn)
+	init_conn.close()
 
 if __name__ == '__main__':
 	parser = argparse.ArgumentParser(description='Query state of running backends tests')
@@ -111,7 +114,8 @@ def main(config):
 	parser.add_argument('--port', type=int, default=5432, help='postgres server port')
 	parser.add_argument('--user', dest='user', default='postgres', help='user name')
 	parser.add_argument('--database', dest='database', default='postgres', help='database name')
-	parser.add_argument('--password', dest='password', nargs=0, action=PasswordPromptAction, default='')
+	parser.add_argument('--password', dest='password', nargs=0, action=PasswordPromptAction, default='', help='password')
+	parser.add_argument('--tpc-ds', dest='use_tpcds', action='store_true', help='run only stress test based on TPC-DS benchmark')
 
 	args = parser.parse_args()
-	main(args.__dict__)
+	main(args)