sts-sponsors team mailing list archive

[Alexsander de Souza <mp+443374@xxxxxxxxxxxxxxxxxx>]

Alexsander de Souza has proposed merging ~alexsander-souza/maas:disable_query_logging_in_perf_tests into maas:master.

Commit message:
disable logging of SQL queries during perf tests

Requested reviews:
  MAAS Lander (maas-lander): unittests
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~alexsander-souza/maas/+git/maas/+merge/443374
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~alexsander-souza/maas:disable_query_logging_in_perf_tests into maas:master.

diff --git a/src/maastesting/pytest/django.py b/src/maastesting/pytest/django.py
index 5eb7915..86f518d 100644
--- a/src/maastesting/pytest/django.py
+++ b/src/maastesting/pytest/django.py
@@ -33,6 +33,11 @@ def pytest_addoption(parser):
         help="The initial DB dump that's used to create the DB template.",
         default=str(default_initial_db),
     )
+    maas_parser.addoption(
+        "--maas-disable-query-logging",
+        help="Disable logging SQL queries",
+        action="store_true",
+    )
 
 
 def load_initial_db_file(cluster, template_name, path):
@@ -101,8 +106,12 @@ def pytest_load_initial_conftests(early_config, parser, args):
     os.environ[
         "DJANGO_SETTINGS_MODULE"
     ] = "maasserver.djangosettings.development"
-    import django
 
+    if "--maas-disable-query-logging" in args:
+        from django.db.backends.base.base import BaseDatabaseWrapper
+        BaseDatabaseWrapper.queries_logged = property(lambda x: False)
+
+    import django
     from maasserver.djangosettings import development
 
     database = development.DATABASES["default"]
diff --git a/utilities/run-perf-tests-ci b/utilities/run-perf-tests-ci
index 5cb3e91..ee2e4f9 100755
--- a/utilities/run-perf-tests-ci
+++ b/utilities/run-perf-tests-ci
@@ -31,6 +31,7 @@ echo "PYTHONHASHSEED=${PYTHONHASHSEED}"
 bin/pytest \
     -v \
     --junit-xml=junit-perf.xml \
+    --maas-disable-query-logging \
     --maas-recreate-initial-db \
     --maas-initial-db "${DB_DUMP}" \
     --perf-output-dir "$OUTPUT_DIR" \