触发器修复增加校验

WorkCase/API/Trigger/test_trigger_update.py

@@ -14,6 +14,7 @@ from WorkApi.API.Trigger.trigger_create import TriggerCreate
 from WorkApi.API.Trigger.trigger_update import TriggerUpdate
 
 from WorkData.Zabbix.triggers import DataTriggers
+from WorkData.Zabbix.functions import DataFunctions
 
 import allure
 
@@ -83,14 +84,20 @@ class TestTriggerUpdate(object):
         return session
 
     @allure.step("查询表：triggers")
-    def select_hosts(self, triggerid=None):
+    def select_triggers(self, triggerid=None):
         session = self.db_session()
         sql = DataTriggers().select_all_from_allKeys(session=session, triggerid=triggerid)
         return sql
 
+    @allure.step("查询表：functions")
+    def select_functions(self, triggerid=None):
+        session = self.db_session()
+        sql = DataFunctions().select_all_from_allKeys(session=session, triggerid=triggerid)
+        return sql
+
     @allure.step("校验查询结果")
     def check_select(self, triggerid, description):
-        sql = self.select_hosts(triggerid=triggerid)
+        sql = self.select_triggers(triggerid=triggerid)
         for x, y in enumerate(sql):
             assert x == 0
             assert y.description == description
@@ -126,10 +133,16 @@ class TestTriggerUpdate(object):
     def test_case_01(self):
         triggerid = self.case_create(num="01")
 
-        response = self.trigger_update(triggerid=triggerid, description=self.base_description + "修改",
+        response = self.trigger_update(triggerid=triggerid, description=self.base_description + "修改1",
                                        expression=self.new_expression)
         self.check_code(response=response, code=0)
-        self.check_select(triggerid=triggerid, description=self.base_description + "修改")
+        self.check_select(triggerid=triggerid, description=self.base_description + "修改1")
+
+        sql_f = self.select_functions(triggerid=triggerid)
+        sql_t = self.select_triggers(triggerid=triggerid)
+        for x, y in enumerate(sql_f):
+            for q, w in enumerate(sql_t):
+                assert str(y.functionid) in w.expression
 
 
 if __name__ == "__main__":

WorkCase/APP/Settings/test_settings_changePassword.py

@@ -32,12 +32,14 @@ class TestSettingsChangePassword(object):
 
     base_id = 10
     login_name = "SS测试用户名"
-    base_name = "SS测试用户名"
+    base_name = "SS测试用户名--修改密码"
     base_password = "123456"
 
     @classmethod
     def setup_class(cls):
         cls.log.debug("开始执行测试套件.......")
+        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
+        DataMembers().delete_like_name(session=session, name=cls.base_name)
 
     @classmethod
     def teardown_class(cls):

WorkCase/__init__.py

@@ -14,8 +14,8 @@ class CaseBase:
             # "db_user": "zmops",
             # "db_pw": "0VMoH%W7|h",
             # "db_base": "zabbix",
-            "host": "http://localhost:7070",
-            "db_url": "10.0.0.155",
+            "host": "http://172.16.3.197:7070",
+            "db_url": "172.16.2.155",
             "db_port": 3306,
             "db_user": "root",
             "db_pw": "123456",
@@ -23,8 +23,8 @@ class CaseBase:
         }
 
         self.app_environment = {
-            "host": "http://10.0.0.12:3334",
-            "db_url": "10.0.0.155",
+            "host": "http://172.16.2.12:3334",
+            "db_url": "172.16.2.155",
             "db_port": 3306,
             "db_user": "root",
             "db_pw": "123456",