feature: 支持bk_agent_id (close TencentBlueKing#562)

zhangzhw8 · Apr 8, 2022 · ce02cad · ce02cad
1 parent 2f0500d
commit ce02cad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/apps/backend/tests/view/test_get_gse_config.py b/apps/backend/tests/view/test_get_gse_config.py
@@ -11,8 +11,6 @@
 
 import copy
 
-from django.db import transaction
-
 from apps.backend.constants import REDIS_AGENT_CONF_KEY_TPL
 from apps.backend.utils.redis import REDIS_INST
 from apps.backend.views import generate_gse_config
@@ -32,8 +30,7 @@ def setUpTestData(cls):
 
         super().setUpTestData()
         host_model_data = copy.deepcopy(common_unit.host.HOST_MODEL_DATA)
-        with transaction.atomic():
-            cls.host = models.Host.objects.create(**host_model_data)
+        cls.host = models.Host.objects.create(**host_model_data)
         # 此类查询在单元测试中会有如下报错， 因此将数据预先查询缓存
         # TransactionManagementError "You can't execute queries until the end of the 'atomic' block" while using signals
         # 参考：https://stackoverflow.com/questions/21458387

diff --git a/apps/utils/unittest/testcase.py b/apps/utils/unittest/testcase.py
@@ -15,7 +15,7 @@
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.test import Client, RequestFactory, TestCase
+from django.test import Client, RequestFactory, TransactionTestCase
 
 from apps.utils.unittest import base
 
@@ -209,7 +209,7 @@ def tearDownClass(cls):
         super().tearDownClass()
 
 
-class CustomBaseTestCase(OverwriteSettingsMixin, AssertDataMixin, MockSuperUserMixin, TestCase):
+class CustomBaseTestCase(OverwriteSettingsMixin, AssertDataMixin, MockSuperUserMixin, TransactionTestCase):
     client_class = Client
 
     @property