fixes 8

rafie · rafie · commit f0f34ff7561e · 2021-12-19T16:15:09.000+02:00
diff --git a/tests/pytest/test_mem.py b/tests/pytest/test_mem.py
@@ -5,12 +5,13 @@
 
 
 CHECK_MEMRECLAIM = os.getenv('MEMRECLAIM', '0') == '1'
+SERDE_JSON = os.getenv('SERDE_JSON', '0') == '1'
 
 JSON_FILES = [
     {'file': 'https://raw.githubusercontent.com/mloskot/json_benchmark/master/data/canada.json',
-     'vsz': 2880000},
+     'vsz': 2880000 if SERDE_JSON else 598000},
     {'file': 'https://raw.githubusercontent.com/RichardHightower/json-parsers-benchmark/master/data/citm_catalog.json',
-     'vsz': 847000},
+     'vsz': 847000 if SERDE_JSON else 200000},
 ]
 
 
@@ -64,7 +65,7 @@ def delete():
             for i in range(0, 100):
                 env.execute_command('json.del', 'json', f'json{i}')
             print(f"--- del: t={datetime.timedelta(seconds=time.monotonic() - t0)}")
-        
+
         fi = 0
         for jfile in JSON_FILES:
             fi += 1
diff --git a/tests/pytest/tests.sh b/tests/pytest/tests.sh
@@ -15,9 +15,9 @@ cd $HERE
 help() {
 	cat <<-END
 		Run Python tests
-	
+
 		[ARGVARS...] tests.sh [--help|help] [<module-so-path>]
-		
+
 		Argument variables:
 		VERBOSE=1        Print commands
 		IGNERR=1         Do not abort on error
@@ -29,7 +29,7 @@ help() {
 		GEN=0|1          General tests
 		AOF=0|1          Tests with --test-aof
 		SLAVES=0|1       Tests with --test-slaves
-		
+
 		TEST=test        Run specific test (e.g. test.py:test_name)
 		LOG=0|1          Write to log
 		VALGRIND|VD=1    Run with Valgrind
@@ -91,11 +91,20 @@ valgrind_summary() {
 
 run_tests() {
 	local title="$1"
-	[[ ! -z $title ]] && { $ROOT/opt/readies/bin/sep -0; printf "Tests with $title:\n\n"; }
+	if [[ -z $title ]]; then
+		title="General tests"
+	else
+		title="Tests with $title"
+	fi
+
 	cd $ROOT/tests/pytest
 	[[ ! -z $TESTMOD ]] && RLTEST_ARGS+=--module $TESTMOD
-	$OP python3 -m RLTest --clear-logs --module $MODULE --module-args "JSON_BACKEND SERDE_JSON" $RLTEST_ARGS
+
+	{ $READIES/bin/sep -0; printf "$title:\n\n"; }
 	$OP python3 -m RLTest --clear-logs --module $MODULE $RLTEST_ARGS
+
+	{ $READIES/bin/sep -0; printf "$title (SERDE_JSON):\n\n"; }
+	SERDE_JSON=1 $OP python3 -m RLTest --clear-logs --module $MODULE --module-args "JSON_BACKEND SERDE_JSON" $RLTEST_ARGS
 }
 
 #----------------------------------------------------------------------------------------------
