[Fixies #13057] Removing Twisted library from the dependencies and the related code (#13058)

* removing Twisted library from the dependencies and the related code

* black reformatting

Author: Gpetrak

geonode/tests/suite/base.py

@@ -1,5 +1,3 @@
-from twisted.python import log
-
 from django.conf import settings
 from django.core import management
 from django.core.management import call_command
@@ -39,30 +37,3 @@ def destroy_test_db(database_name):
 
 def load_db_fixtures(fixtures):
     call_command("loaddata", *fixtures)
-
-
-def setup_test_db(worker_index, fixtures, fn, *args):
-    management.get_commands()
-    management._commands["syncdb"] = "django.core"
-
-    old_name = settings.DATABASES["default"]["NAME"]
-    if worker_index is not None:
-        test_database_name = f"test_{worker_index}_{old_name}"
-    else:
-        test_database_name = f"test_{old_name}"
-
-    create_test_db(test_database_name)
-    if fixtures:
-        load_db_fixtures(fixtures)
-
-    result = None
-    try:
-        result = fn(*args)
-    except Exception as e:
-        log.err(str(e))
-        raise
-    finally:
-        destroy_test_db(test_database_name)
-
-    connection.settings_dict["NAME"] = old_name
-    return result

geonode/tests/suite/runner.py

@@ -11,16 +11,12 @@
 from queue import Empty
 from typing import Collection
 
-from twisted.scripts.trial import Options, _getSuite
-from twisted.trial.runner import TrialRunner
-
 from django.conf import settings
 
 from django.test.runner import DiscoverRunner
 from django.db import connections, DEFAULT_DB_ALIAS
 from django.core.exceptions import ImproperlyConfigured
 
-from .base import setup_test_db
 
 # "auto" - one worker per Django application
 # "cpu" - one worker per process core
@@ -286,12 +282,7 @@ def pop_item():
                         results_queue.put((group, result))
                         logger.debug(f"Worker {index} has finished running tests {tests}")
                     except (KeyboardInterrupt, SystemExit):
-                        if isinstance(self, TwistedParallelTestSuiteRunner):
-                            # Twisted raises KeyboardInterrupt when the tests
-                            # have completed
-                            pass
-                        else:
-                            raise
+                        raise
                     except Exception as e:
                         logger.debug(f"Running tests failed, reason: {e}")
                         result = TestResult().from_exception(e)
@@ -517,60 +508,6 @@ def __init__(self, verbosity=2, failfast=True, **kwargs):
         super().__init__(stream=stream, verbosity=verbosity, failfast=failfast)
 
 
-class TwistedParallelTestSuiteRunner(ParallelTestSuiteRunner):
-    def __init__(self, config, verbosity=1, interactive=False, failfast=True, **kwargs):
-        self.config = config
-        super().__init__(verbosity, interactive, failfast, **kwargs)
-
-    def run_tests(self, test_labels, extra_tests=None, **kwargs):
-        app_tests = self._group_by_app(test_labels)
-        return self._run_tests(tests=app_tests)
-
-    def run_suite(self):
-        # config = self.config
-        tests = self.config.opts["tests"]
-
-        tests = self._group_by_file(tests)
-        self._run_tests(tests=tests)
-
-    def _tests_func(self, tests, worker_index):
-        if not isinstance(tests, (list, set)):
-            tests = [tests]
-
-        args = ["-e"]
-        args.extend(tests)
-
-        config = Options()
-        config.parseOptions(args)
-
-        stream = BufferWritesDevice()
-        runner = self._make_runner(config=config, stream=stream)
-        suite = _getSuite(config)
-        result = setup_test_db(worker_index, None, runner.run, suite)
-        result = TestResult().from_trial_result(result)
-        return result
-
-    def _make_runner(self, config, stream):
-        # Based on twisted.scripts.trial._makeRunner
-        mode = None
-        if config["debug"]:
-            mode = TrialRunner.DEBUG
-        if config["dry-run"]:
-            mode = TrialRunner.DRY_RUN
-        return TrialRunner(
-            config["reporter"],
-            mode=mode,
-            stream=stream,
-            profile=config["profile"],
-            logfile=config["logfile"],
-            tracebackFormat=config["tbformat"],
-            realTimeErrors=config["rterrors"],
-            uncleanWarnings=config["unclean-warnings"],
-            workingDirectory=config["temp-directory"],
-            forceGarbageCollection=config["force-gc"],
-        )
-
-
 class TestResult:
     dots = False
     errors = None

requirements.txt

@@ -161,7 +161,6 @@ pytest-splinter==3.3.2
 pytest-django==4.8.0
 pip==25.0.1
 setuptools>=70.2.0,<70.3.0
-Twisted==24.3.0
 pixelmatch==0.3.0
 factory-boy==3.3.0
 flaky==3.8.1

requirements_tests.txt

@@ -1,3 +1,2 @@
-Twisted
 pixelmatch==0.3.0
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability

setup.cfg

@@ -183,7 +183,6 @@ install_requires =
     pytest-django==4.8.0
     pip==24.1.2
     setuptools>=70.2.0,<70.3.0
-    Twisted==24.3.0
     pixelmatch==0.3.0
     factory-boy==3.3.0
     flaky==3.8.1