整个业务代码重构

WorkCase/APP/Rule/test_rule_create.py

@@ -164,38 +164,12 @@ class TestRuleCreate(object):
             assert y.description == name
             assert x == 0
 
-    @allure.title("rule.create：token未传")
-    @allure.story("创建告警规则：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.rule_create()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("rule.create：token的用户已删除")
-    @allure.story("创建告警规则：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.rule_create(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("rule.create：token的用户已禁用")
-    @allure.story("创建告警规则：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.rule_create(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("rule.create：创建普通告警规则")
     @allure.story("创建告警规则：创建普通告警规则")
     @allure.severity("blocker")
-    def test_case_04(self):
-        host_name = self.base_host_name + "04"
-        name = self.base_name + "04"
+    def test_case_01(self):
+        host_name = self.base_host_name + "01"
+        name = self.base_name + "01"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])
@@ -214,9 +188,9 @@ class TestRuleCreate(object):
 
     @allure.title("rule.create：创建agent设备在线规则")
     @allure.story("创建告警规则：创建agent设备在线规则")
-    def test_case_05(self):
-        host_name = self.base_host_name + "05"
-        name = self.base_name + "05"
+    def test_case_02(self):
+        host_name = self.base_host_name + "02"
+        name = self.base_name + "02"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])
@@ -231,9 +205,9 @@ class TestRuleCreate(object):
 
     @allure.title("rule.create：创建agent设备离线规则")
     @allure.story("创建告警规则：创建agent设备离线规则")
-    def test_case_06(self):
-        host_name = self.base_host_name + "06"
-        name = self.base_name + "06"
+    def test_case_03(self):
+        host_name = self.base_host_name + "03"
+        name = self.base_name + "03"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])
@@ -248,9 +222,9 @@ class TestRuleCreate(object):
 
     @allure.title("rule.create：创建icmp设备在线规则")
     @allure.story("创建告警规则：创建icmp设备在线规则")
-    def test_case_07(self):
-        host_name = self.base_host_name + "07"
-        name = self.base_name + "07"
+    def test_case_04(self):
+        host_name = self.base_host_name + "04"
+        name = self.base_name + "04"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_snmp,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])
@@ -265,9 +239,9 @@ class TestRuleCreate(object):
 
     @allure.title("rule.create：创建icmp设备离线规则")
     @allure.story("创建告警规则：创建icmp设备离线规则")
-    def test_case_08(self):
-        host_name = self.base_host_name + "08"
-        name = self.base_name + "08"
+    def test_case_05(self):
+        host_name = self.base_host_name + "05"
+        name = self.base_name + "05"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_snmp,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])
@@ -282,9 +256,9 @@ class TestRuleCreate(object):
 
     @allure.title("rule.create：创建普通告警规则-所有字段校验")
     @allure.story("创建告警规则：创建普通告警规则-所有字段校验")
-    def test_case_09(self):
-        host_name = self.base_host_name + "09"
-        name = self.base_name + "09"
+    def test_case_06(self):
+        host_name = self.base_host_name + "06"
+        name = self.base_name + "06"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])

WorkCase/APP/Rule/test_rule_delete.py

@@ -147,38 +147,12 @@ class TestRuleDelete(object):
             self.item_name = y.name
             self.item_id = y.id
 
-    @allure.title("rule.delete：token未传")
-    @allure.story("删除告警规则：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.rule_delete()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("rule.delete：token的用户已删除")
-    @allure.story("删除告警规则：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.rule_delete(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("rule.delete：token的用户已禁用")
-    @allure.story("删除告警规则：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.rule_delete(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("rule.delete：删除一个")
     @allure.story("删除告警规则：删除一个")
     @allure.severity("blocker")
-    def test_case_04(self):
-        host_name = self.base_host_name + "04"
-        name = self.base_name + "04"
+    def test_case_01(self):
+        host_name = self.base_host_name + "01"
+        name = self.base_name + "01"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])
@@ -200,11 +174,11 @@ class TestRuleDelete(object):
     @allure.title("rule.delete：删除多个")
     @allure.story("删除告警规则：删除多个")
     @allure.severity("blocker")
-    def test_case_05(self):
-        host_name = self.base_host_name + "05"
-        name_1 = self.base_name + "051"
-        name_2 = self.base_name + "052"
-        name_3 = self.base_name + "053"
+    def test_case_02(self):
+        host_name = self.base_host_name + "02"
+        name_1 = self.base_name + "021"
+        name_2 = self.base_name + "022"
+        name_3 = self.base_name + "023"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])

WorkCase/APP/Rule/test_rule_get.py

@@ -126,44 +126,18 @@ class TestRuleGet(object):
             self.item_name = y.name
             self.item_id = y.id
 
-    @allure.title("rule.get：token未传")
-    @allure.story("查询告警规则：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.rule_get()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("rule.get：token的用户已删除")
-    @allure.story("查询告警规则：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.rule_get(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("rule.get：token的用户已禁用")
-    @allure.story("查询告警规则：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.rule_get(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("rule.get：无参数调用")
     @allure.story("查询告警规则：无参数调用")
     @allure.severity("blocker")
-    def test_case_04(self):
+    def test_case_01(self):
         response = self.app.rule_get(token=self.token)
         self.app.check_code(response=response, code=0)
 
     @allure.title("rule.get：severity查询")
     @allure.story("查询告警规则：severity查询")
-    def test_case_05(self):
-        host_name = self.base_host_name + "05"
-        name = self.base_name + "05"
+    def test_case_02(self):
+        host_name = self.base_host_name + "02"
+        name = self.base_name + "02"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])
@@ -180,9 +154,9 @@ class TestRuleGet(object):
 
     @allure.title("rule.get：item_id查询")
     @allure.story("查询告警规则：item_id查询")
-    def test_case_06(self):
-        host_name = self.base_host_name + "06"
-        name = self.base_name + "06"
+    def test_case_03(self):
+        host_name = self.base_host_name + "03"
+        name = self.base_name + "03"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])
@@ -201,9 +175,9 @@ class TestRuleGet(object):
 
     @allure.title("rule.get：manageLevel查询")
     @allure.story("查询告警规则：manageLevel查询")
-    def test_case_07(self):
-        host_name = self.base_host_name + "07"
-        name = self.base_name + "07"
+    def test_case_04(self):
+        host_name = self.base_host_name + "04"
+        name = self.base_name + "04"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])

WorkCase/APP/Rule/test_rule_list.py

@@ -128,48 +128,18 @@ class TestRuleList(object):
             self.item_name = y.name
             self.item_id = y.id
 
-    @allure.title("rule.list：token未传")
-    @allure.story("查询告警规则下拉框：token未传")
-    @allure.severity("blocker")
-    @pytest.mark.skip(reason="此接口未加入token验证")
-    def test_case_01(self):
-        response = self.app.rule_list()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("rule.list：token的用户已删除")
-    @allure.story("查询告警规则下拉框：token的用户已删除")
-    @allure.severity("blocker")
-    @pytest.mark.skip(reason="此接口未加入token验证")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.rule_list(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("rule.list：token的用户已禁用")
-    @allure.story("查询告警规则下拉框：token的用户已禁用")
-    @allure.severity("blocker")
-    @pytest.mark.skip(reason="此接口未加入token验证")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.rule_list(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("rule.list：无参数调用")
     @allure.story("查询告警规则下拉框：无参数调用")
     @allure.severity("blocker")
-    @pytest.mark.skip(reason="此接口未加入token验证")
-    def test_case_04(self):
+    def test_case_01(self):
         response = self.app.rule_list(token=self.token)
         self.app.check_code(response=response, code=0)
 
     @allure.title("rule.list：ruleName模糊查询")
     @allure.story("查询告警规则下拉框：ruleName模糊查询")
-    def test_case_05(self):
-        host_name = self.base_host_name + "05"
-        name = self.base_name + "05"
+    def test_case_02(self):
+        host_name = self.base_host_name + "02"
+        name = self.base_name + "02"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])
@@ -186,9 +156,9 @@ class TestRuleList(object):
 
     @allure.title("rule.list：ruleName精确查询")
     @allure.story("查询告警规则下拉框：ruleName精确查询")
-    def test_case_06(self):
-        host_name = self.base_host_name + "06"
-        name = self.base_name + "06"
+    def test_case_03(self):
+        host_name = self.base_host_name + "03"
+        name = self.base_name + "03"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])

WorkCase/APP/Rule/test_rule_update.py

@@ -156,38 +156,12 @@ class TestRuleUpdate(object):
             assert y.period == period
             assert y.period_unit == periodType
 
-    @allure.title("rule.update：token未传")
-    @allure.story("更新告警规则：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.rule_update()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("rule.update：token的用户已删除")
-    @allure.story("更新告警规则：token的用户已删除")
-    @allure.severity("blocker")
-    def test_case_02(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
-        response = self.app.rule_update(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("rule.update：token的用户已禁用")
-    @allure.story("更新告警规则：token的用户已禁用")
-    @allure.severity("blocker")
-    def test_case_03(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
-        response = self.app.rule_update(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("rule.update：更新普通告警规则")
     @allure.story("更新告警规则：更新普通告警规则")
     @allure.severity("blocker")
-    def test_case_04(self):
-        host_name = self.base_host_name + "04"
-        name = self.base_name + "04"
+    def test_case_01(self):
+        host_name = self.base_host_name + "01"
+        name = self.base_name + "01"
         host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
                                             iplist=self.base_ip, port=self.base_port,
                                             businessIds=[self.base_business_id_1, self.base_business_id_2])