Merge pull request #3 from surface-security/fix_analyze

Fix analyze

Author: fopinappb

.github/workflows/publish_test.yml_disabled renamed to .github/workflows/publish_test.yml

@@ -1,11 +1,11 @@
 # This workflows will upload a Python Package using Twine when a release is created
 # For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
 
-name: publish
+name: publish test
 
 on:
-  release:
-    types: [created]
+  push:
+    branches: testpypi
 
 jobs:
   deploy:

dbcleanup/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 
 default_app_config = 'dbcleanup.apps.DBCleanupConfig'

dbcleanup/utils.py

@@ -5,8 +5,13 @@
 
 @lru_cache()
 def model_tables():
+    from .models import Table
+
     tables_in_use = {}
     for m in registry.apps.get_models():
+        if m == Table:
+            # skip ourselves
+            continue
         if not m._meta.managed:
             # skip models not managed by django
             continue

testapp/tests/test_analyze.py

@@ -0,0 +1,33 @@
+import unittest
+from unittest import mock
+from io import StringIO
+
+from django.test import TestCase
+from django.apps import registry
+from django.contrib.auth import get_user_model
+from django.core.management import call_command
+from django.urls import reverse
+from django.conf import settings
+
+from dbcleanup import utils, models, admin
+
+
+@unittest.skipUnless(
+    settings.DATABASES['default']['ENGINE'] in ('django.db.backends.mysql'),
+    "only mysql",
+)
+class Test(TestCase):
+    def test_command(self):
+        out = StringIO()
+        call_command('dbcleanup', stdout=out, just='analyze')
+        # there might be old tables in the testdb, do not assume empty output...
+        baseline = {x.split(' ')[1] for x in out.getvalue().splitlines()}
+        # cannot create tables inside TransactionTests (it's mysql), so let's "remove" a model
+        org_list = [m for m in registry.apps.get_models() if m._meta.db_table != 'auth_user']
+        utils.model_tables.cache_clear()
+        with mock.patch('django.apps.registry.apps.get_models', return_value=org_list):
+            call_command('dbcleanup', stdout=out, just='tables')
+            self.assertEqual(
+                {x.split(' ')[1] for x in out.getvalue().splitlines()} - baseline,
+                {'auth_user', 'auth_user_groups', 'auth_user_user_permissions'},
+            )