巡检任务

WorkCase/APP/Inspection/test_inspection_rule_create.py

@@ -102,38 +102,12 @@ class TestInspectionRuleCreate(object):
             assert y.status == status
             assert x == 0
 
-    @allure.title("inspections.rule.create：token未传")
-    @allure.story("创建巡检任务：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.inspection_rule_create()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("inspections.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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("inspections.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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("inspections.rule.create：成功创建-自动日巡检")
     @allure.story("创建巡检任务：成功创建-自动日巡检")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name = self.base_name + "04"
-        host_name = self.base_host_name + "04"
+    def test_case_01(self):
+        name = self.base_name + "01"
+        host_name = self.base_host_name + "01"
         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])
@@ -145,9 +119,9 @@ class TestInspectionRuleCreate(object):
     @allure.title("inspections.rule.create：成功创建-自动周巡检")
     @allure.story("创建巡检任务：成功创建-自动周巡检")
     @allure.severity("blocker")
-    def test_case_05(self):
-        name = self.base_name + "05"
-        host_name = self.base_host_name + "05"
+    def test_case_02(self):
+        name = self.base_name + "02"
+        host_name = self.base_host_name + "02"
         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])
@@ -159,9 +133,9 @@ class TestInspectionRuleCreate(object):
     @allure.title("inspections.rule.create：成功创建-自动月巡检")
     @allure.story("创建巡检任务：成功创建-自动月巡检")
     @allure.severity("blocker")
-    def test_case_06(self):
-        name = self.base_name + "06"
-        host_name = self.base_host_name + "06"
+    def test_case_03(self):
+        name = self.base_name + "03"
+        host_name = self.base_host_name + "03"
         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])
@@ -173,9 +147,9 @@ class TestInspectionRuleCreate(object):
     @allure.title("inspections.rule.create：成功创建-手动巡检")
     @allure.story("创建巡检任务：成功创建-手动巡检")
     @allure.severity("blocker")
-    def test_case_07(self):
-        name = self.base_name + "07"
-        host_name = self.base_host_name + "07"
+    def test_case_04(self):
+        name = self.base_name + "04"
+        host_name = self.base_host_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])

WorkCase/APP/Inspection/test_inspection_rule_delete.py

@@ -94,41 +94,15 @@ class TestInspectionRuleDelete(object):
             assert y.status == status
             assert x == 0
 
-    @allure.title("inspections.rule.delete：token未传")
-    @allure.story("删除巡检任务：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.inspection_rule_create()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("inspections.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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("inspections.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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("inspections.rule.delete：删除一个")
     @allure.story("删除巡检任务：删除一个")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name_1 = self.base_name + "041"
-        name_2 = self.base_name + "042"
-        name_3 = self.base_name + "043"
-        name_4 = self.base_name + "044"
-        host_name = self.base_host_name + "04"
+    def test_case_01(self):
+        name_1 = self.base_name + "011"
+        name_2 = self.base_name + "012"
+        name_3 = self.base_name + "013"
+        name_4 = self.base_name + "014"
+        host_name = self.base_host_name + "01"
         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])
@@ -150,12 +124,12 @@ class TestInspectionRuleDelete(object):
     @allure.title("inspections.rule.delete：删除多个")
     @allure.story("删除巡检任务：删除多个")
     @allure.severity("blocker")
-    def test_case_05(self):
-        name_1 = self.base_name + "051"
-        name_2 = self.base_name + "052"
-        name_3 = self.base_name + "053"
-        name_4 = self.base_name + "054"
-        host_name = self.base_host_name + "05"
+    def test_case_02(self):
+        name_1 = self.base_name + "021"
+        name_2 = self.base_name + "022"
+        name_3 = self.base_name + "023"
+        name_4 = self.base_name + "024"
+        host_name = self.base_host_name + "02"
         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])
@@ -181,12 +155,12 @@ if __name__ == "__main__":
     import os
 
     # 执行自动化测试用例
-    # case_info = os.path.split(__file__)
-    # case = UtilsCmd().pytest_cmd()
-    # r = UtilsPyTest(case=case, case_info=case_info)
-    # r.run_main()
-
-    a = TestInspectionRuleDelete()
-    a.setup_class()
-    a.setup_method()
-    a.test_case_04()
+    case_info = os.path.split(__file__)
+    case = UtilsCmd().pytest_cmd()
+    r = UtilsPyTest(case=case, case_info=case_info)
+    r.run_main()
+
+    # a = TestInspectionRuleDelete()
+    # a.setup_class()
+    # a.setup_method()
+    # a.test_case_04()

WorkCase/APP/Inspection/test_inspection_rule_get.py

@@ -99,41 +99,15 @@ class TestInspectionRuleGet(object):
             assert y.status == status
             assert x == 0
 
-    @allure.title("inspections.rule.get：token未传")
-    @allure.story("查询巡检任务：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.inspection_rule_create()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("inspections.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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("inspections.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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("inspections.rule.get：无参数调用")
     @allure.story("查询巡检任务：无参数调用")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name_1 = self.base_name + "041"
-        name_2 = self.base_name + "042"
-        name_3 = self.base_name + "043"
-        name_4 = self.base_name + "044"
-        host_name = self.base_host_name + "04"
+    def test_case_01(self):
+        name_1 = self.base_name + "011"
+        name_2 = self.base_name + "012"
+        name_3 = self.base_name + "013"
+        name_4 = self.base_name + "014"
+        host_name = self.base_host_name + "01"
         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])
@@ -160,12 +134,12 @@ class TestInspectionRuleGet(object):
     @allure.title("inspections.rule.get：name模糊查询")
     @allure.story("查询巡检任务：name模糊查询")
     @allure.severity("blocker")
-    def test_case_05(self):
-        name_1 = self.base_name + "051"
-        name_2 = self.base_name + "052"
-        name_3 = self.base_name + "053"
-        name_4 = self.base_name + "054"
-        host_name = self.base_host_name + "05"
+    def test_case_02(self):
+        name_1 = self.base_name + "021"
+        name_2 = self.base_name + "022"
+        name_3 = self.base_name + "023"
+        name_4 = self.base_name + "024"
+        host_name = self.base_host_name + "02"
         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])
@@ -182,12 +156,12 @@ class TestInspectionRuleGet(object):
     @allure.title("inspections.rule.get：name精确查询")
     @allure.story("查询巡检任务：name精确查询")
     @allure.severity("blocker")
-    def test_case_06(self):
-        name_1 = self.base_name + "061"
-        name_2 = self.base_name + "062"
-        name_3 = self.base_name + "063"
-        name_4 = self.base_name + "064"
-        host_name = self.base_host_name + "06"
+    def test_case_03(self):
+        name_1 = self.base_name + "031"
+        name_2 = self.base_name + "032"
+        name_3 = self.base_name + "033"
+        name_4 = self.base_name + "034"
+        host_name = self.base_host_name + "03"
         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])
@@ -204,12 +178,12 @@ class TestInspectionRuleGet(object):
     @allure.title("inspections.rule.get：period查询")
     @allure.story("查询巡检任务：period查询")
     @allure.severity("blocker")
-    def test_case_07(self):
-        name_1 = self.base_name + "071"
-        name_2 = self.base_name + "072"
-        name_3 = self.base_name + "073"
-        name_4 = self.base_name + "074"
-        host_name = self.base_host_name + "07"
+    def test_case_04(self):
+        name_1 = self.base_name + "041"
+        name_2 = self.base_name + "042"
+        name_3 = self.base_name + "043"
+        name_4 = self.base_name + "044"
+        host_name = self.base_host_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])

WorkCase/APP/Inspection/test_inspection_rule_status.py

@@ -94,38 +94,12 @@ class TestInspectionRuleStatus(object):
             assert y.status == status
             assert x == 0
 
-    @allure.title("inspections.rule.status：token未传")
-    @allure.story("更新巡检任务状态：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.inspection_rule_create()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("inspections.rule.status：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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("inspections.rule.status：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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("inspections.rule.status：关闭任务")
     @allure.story("更新巡检任务状态：关闭任务")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name = self.base_name + "04"
-        host_name = self.base_host_name + "04"
+    def test_case_01(self):
+        name = self.base_name + "01"
+        host_name = self.base_host_name + "01"
         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])
@@ -138,9 +112,9 @@ class TestInspectionRuleStatus(object):
     @allure.title("inspections.rule.status：启用任务")
     @allure.story("更新巡检任务状态：启用任务")
     @allure.severity("blocker")
-    def test_case_05(self):
-        name = self.base_name + "05"
-        host_name = self.base_host_name + "05"
+    def test_case_02(self):
+        name = self.base_name + "02"
+        host_name = self.base_host_name + "02"
         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])

WorkCase/APP/Inspection/test_inspection_rule_update.py

@@ -99,38 +99,12 @@ class TestInspectionRuleUpdate(object):
             assert y.status == status
             assert x == 0
 
-    @allure.title("inspections.rule.update：token未传")
-    @allure.story("更新巡检任务：token未传")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        response = self.app.inspection_rule_create()
-        self.app.check_code(response=response, code=2001)
-        self.app.check_msg(response=response, msg="token不存在")
-
-    @allure.title("inspections.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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2004)
-        self.app.check_msg(response=response, msg="用户不存在")
-
-    @allure.title("inspections.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.inspection_rule_create(token=self.token)
-        self.app.check_code(response=response, code=2003)
-        self.app.check_msg(response=response, msg="账户已被禁用")
-
     @allure.title("inspections.rule.update：成功修改-自动日巡检")
     @allure.story("更新巡检任务：成功修改-自动日巡检")
     @allure.severity("blocker")
-    def test_case_04(self):
-        name = self.base_name + "04"
-        host_name = self.base_host_name + "04"
+    def test_case_01(self):
+        name = self.base_name + "01"
+        host_name = self.base_host_name + "01"
         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])
@@ -144,9 +118,9 @@ class TestInspectionRuleUpdate(object):
     @allure.title("inspections.rule.update：成功更新-自动周巡检")
     @allure.story("更新巡检任务：成功更新-自动周巡检")
     @allure.severity("blocker")
-    def test_case_05(self):
-        name = self.base_name + "05"
-        host_name = self.base_host_name + "05"
+    def test_case_02(self):
+        name = self.base_name + "02"
+        host_name = self.base_host_name + "02"
         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])
@@ -159,9 +133,9 @@ class TestInspectionRuleUpdate(object):
     @allure.title("inspections.rule.update：成功更新-自动月巡检")
     @allure.story("更新巡检任务：成功更新-自动月巡检")
     @allure.severity("blocker")
-    def test_case_06(self):
-        name = self.base_name + "06"
-        host_name = self.base_host_name + "06"
+    def test_case_03(self):
+        name = self.base_name + "03"
+        host_name = self.base_host_name + "03"
         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])
@@ -174,9 +148,9 @@ class TestInspectionRuleUpdate(object):
     @allure.title("inspections.rule.update：成功更新-手动巡检")
     @allure.story("更新巡检任务：成功更新-手动巡检")
     @allure.severity("blocker")
-    def test_case_07(self):
-        name = self.base_name + "07"
-        host_name = self.base_host_name + "07"
+    def test_case_04(self):
+        name = self.base_name + "04"
+        host_name = self.base_host_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])