用户模块优化

WorkCase/APP/Members/test_members_create.py

@@ -49,13 +49,13 @@ class TestMembersCreate(object):
 
     def setup_method(self):
         self.log.debug("测试用例执行开始...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     @allure.step("调用接口：api.login")
     def api_login(self, name=None, password=None):
@@ -145,7 +145,7 @@ class TestMembersCreate(object):
             assert y.silence_time == silenceTime
             assert y.period == period
             assert y.severity == severity
-            assert y.status == 0
+            assert y.status == CaseBase().status["ON"]
 
     @allure.step("断言返回结果")
     def check_code(self, response, code):
@@ -172,7 +172,7 @@ class TestMembersCreate(object):
     @allure.severity("blocker")
     def test_case_02(self):
         self.get_base_token()
-        self.update_members_del_flag(members_id=self.base_id, value=1)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
         response = self.members_create(token=self.token)
         self.check_code(response=response, code=2004)
         self.check_msg(response=response, msg="用户不存在")
@@ -182,7 +182,7 @@ class TestMembersCreate(object):
     @allure.severity("blocker")
     def test_case_03(self):
         self.get_base_token()
-        self.update_members_status(members_id=self.base_id, value=1)
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["OFF"])
         response = self.members_create(token=self.token)
         self.check_code(response=response, code=2003)
         self.check_msg(response=response, msg="账户已被禁用")

WorkCase/APP/Members/test_members_delete.py

@@ -48,13 +48,13 @@ class TestMembersDelete(object):
 
     def setup_method(self):
         self.log.debug("测试用例执行开始...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     @allure.step("调用接口：api.login")
     def api_login(self, name=None, password=None):
@@ -144,7 +144,7 @@ class TestMembersDelete(object):
             assert y.dingding_url == dingdingUrl
             assert y.remark == remark
             assert y.del_flag == del_flag
-            assert y.status == 0
+            assert y.status == CaseBase().status["ON"]
 
     @allure.step("断言返回结果")
     def check_code(self, response, code):
@@ -171,7 +171,7 @@ class TestMembersDelete(object):
     @allure.severity("blocker")
     def test_case_02(self):
         self.get_base_token()
-        self.update_members_del_flag(members_id=self.base_id, value=1)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
         response = self.members_delete(token=self.token)
         self.check_code(response=response, code=2004)
         self.check_msg(response=response, msg="用户不存在")
@@ -181,7 +181,7 @@ class TestMembersDelete(object):
     @allure.severity("blocker")
     def test_case_03(self):
         self.get_base_token()
-        self.update_members_status(members_id=self.base_id, value=1)
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["OFF"])
         response = self.members_delete(token=self.token)
         self.check_code(response=response, code=2003)
         self.check_msg(response=response, msg="账户已被禁用")

WorkCase/APP/Members/test_members_get.py

@@ -50,13 +50,13 @@ class TestMembersGet(object):
 
     def setup_method(self):
         self.log.debug("测试用例执行开始...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     @allure.step("调用接口：api.login")
     def api_login(self, name=None, password=None):
@@ -170,7 +170,7 @@ class TestMembersGet(object):
     @allure.severity("blocker")
     def test_case_02(self):
         self.get_base_token()
-        self.update_members_del_flag(members_id=self.base_id, value=1)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
         response = self.members_get(token=self.token)
         self.check_code(response=response, code=2004)
         self.check_msg(response=response, msg="用户不存在")
@@ -180,7 +180,7 @@ class TestMembersGet(object):
     @allure.severity("blocker")
     def test_case_03(self):
         self.get_base_token()
-        self.update_members_status(members_id=self.base_id, value=1)
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["OFF"])
         response = self.members_get(token=self.token)
         self.check_code(response=response, code=2003)
         self.check_msg(response=response, msg="账户已被禁用")
@@ -218,20 +218,20 @@ class TestMembersGet(object):
         self.check_code(response=response, code=0)
         self.check_select(response=response, members_id=memberId)
 
-    @allure.title("members.get：status=1查询")
-    @allure.story("查询用户：status=1查询")
+    @allure.title("members.get：status=0查询")
+    @allure.story("查询用户：status=0查询")
     def test_case_07(self):
         self.get_base_token()
 
         name = self.base_name + "07"
         response = self.members_create(token=self.token, name=name, password=self.base_password, role=0)
         UtilsResponse().get_data(response=response)
-        response = self.members_get(token=self.token, name=name, status=1)
+        response = self.members_get(token=self.token, name=name, status=0)
         self.check_code(response=response, code=0)
         assert [] == UtilsResponse().get_data(response=response)["list"]
 
-    @allure.title("members.get：status=0查询")
-    @allure.story("查询用户：status=0查询")
+    @allure.title("members.get：status=1查询")
+    @allure.story("查询用户：status=1查询")
     def test_case_08(self):
         self.get_base_token()
 

WorkCase/APP/Members/test_members_get_role.py

@@ -43,13 +43,13 @@ class TestMembersGetRole(object):
 
     def setup_method(self):
         self.log.debug("测试用例执行开始...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     @allure.step("调用接口：api.login")
     def api_login(self, name=None, password=None):
@@ -127,7 +127,7 @@ class TestMembersGetRole(object):
     @allure.severity("blocker")
     def test_case_02(self):
         self.get_base_token()
-        self.update_members_del_flag(members_id=self.base_id, value=1)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
         response = self.members_get_role(token=self.token)
         self.check_code(response=response, code=2004)
         self.check_msg(response=response, msg="用户不存在")
@@ -137,7 +137,7 @@ class TestMembersGetRole(object):
     @allure.severity("blocker")
     def test_case_03(self):
         self.get_base_token()
-        self.update_members_status(members_id=self.base_id, value=1)
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["OFF"])
         response = self.members_get_role(token=self.token)
         self.check_code(response=response, code=2003)
         self.check_msg(response=response, msg="账户已被禁用")

WorkCase/APP/Members/test_members_list.py

@@ -6,6 +6,8 @@
 
 from __future__ import division
 
+import pytest
+
 from WorkApi.APP.Api.api_login import ApiLogin
 from WorkUtils.UtilsLog import UtilsLog
 from WorkUtils.UtilsDataBase import UtilsDataBase
@@ -46,9 +48,13 @@ class TestMembersList(object):
 
     def setup_method(self):
         self.log.debug("测试用例执行开始...")
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     @allure.step("调用接口：members.list")
     def members_list(self, token=None):
@@ -101,9 +107,22 @@ class TestMembersList(object):
         sql = DataMembers().select_all_from_allKeys(session=session, _id=_id)
         return sql
 
+    @allure.step("更新表数据：members -- del_flag")
+    def update_members_del_flag(self, members_id=None, value=None):
+        session = self.db_session()
+        sql = DataMembers().update_del_flag(session=session, _id=members_id, value=value)
+        return sql
+
+    @allure.step("更新表数据：members -- status")
+    def update_members_status(self, members_id=None, value=None):
+        session = self.db_session()
+        sql = DataMembers().update_status(session=session, _id=members_id, value=value)
+        return sql
+
     @allure.title("members.list：token未传")
     @allure.story("查询用户下拉框：token未传")
     @allure.severity("blocker")
+    @pytest.mark.skip(reason="此接口未加入token验证")
     def test_case_01(self):
         self.get_base_token()
 
@@ -114,9 +133,10 @@ class TestMembersList(object):
     @allure.title("members.list：token的用户已删除")
     @allure.story("查询用户下拉框：token的用户已删除")
     @allure.severity("blocker")
+    @pytest.mark.skip(reason="此接口未加入token验证")
     def test_case_02(self):
         self.get_base_token()
-        self.update_members_del_flag(members_id=self.base_id, value=1)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
         response = self.members_list(token=self.token)
         self.check_code(response=response, code=2004)
         self.check_msg(response=response, msg="用户不存在")
@@ -124,9 +144,10 @@ class TestMembersList(object):
     @allure.title("members.list：token的用户已禁用")
     @allure.story("查询用户下拉框：token的用户已禁用")
     @allure.severity("blocker")
+    @pytest.mark.skip(reason="此接口未加入token验证")
     def test_case_03(self):
         self.get_base_token()
-        self.update_members_status(members_id=self.base_id, value=1)
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["OFF"])
         response = self.members_list(token=self.token)
         self.check_code(response=response, code=2003)
         self.check_msg(response=response, msg="账户已被禁用")

WorkCase/APP/Members/test_members_update_info.py

@@ -48,13 +48,13 @@ class TestMembersUpdateInfo(object):
 
     def setup_method(self):
         self.log.debug("测试用例执行开始...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     @allure.step("调用接口：api.login")
     def api_login(self, name=None, password=None):
@@ -166,7 +166,7 @@ class TestMembersUpdateInfo(object):
             assert y.silence_time == silenceTime
             assert y.period == period
             assert y.severity == severity
-            assert y.status == 0
+            assert y.status == CaseBase().status["ON"]
 
     @allure.step("断言返回结果")
     def check_code(self, response, code):
@@ -193,7 +193,7 @@ class TestMembersUpdateInfo(object):
     @allure.severity("blocker")
     def test_case_02(self):
         self.get_base_token()
-        self.update_members_del_flag(members_id=self.base_id, value=1)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
         response = self.members_update_info(token=self.token)
         self.check_code(response=response, code=2004)
         self.check_msg(response=response, msg="用户不存在")
@@ -203,7 +203,7 @@ class TestMembersUpdateInfo(object):
     @allure.severity("blocker")
     def test_case_03(self):
         self.get_base_token()
-        self.update_members_status(members_id=self.base_id, value=1)
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["OFF"])
         response = self.members_update_info(token=self.token)
         self.check_code(response=response, code=2003)
         self.check_msg(response=response, msg="账户已被禁用")

WorkCase/APP/Members/test_members_update_status.py

@@ -48,13 +48,13 @@ class TestMembersUpdateStatus(object):
 
     def setup_method(self):
         self.log.debug("测试用例执行开始...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
-        self.update_members_del_flag(members_id=self.base_id, value=0)
-        self.update_members_status(members_id=self.base_id, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
 
     @allure.step("调用接口：api.login")
     def api_login(self, name=None, password=None):
@@ -172,7 +172,7 @@ class TestMembersUpdateStatus(object):
     @allure.severity("blocker")
     def test_case_02(self):
         self.get_base_token()
-        self.update_members_del_flag(members_id=self.base_id, value=1)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
         response = self.members_update_status(token=self.token)
         self.check_code(response=response, code=2004)
         self.check_msg(response=response, msg="用户不存在")
@@ -182,7 +182,7 @@ class TestMembersUpdateStatus(object):
     @allure.severity("blocker")
     def test_case_03(self):
         self.get_base_token()
-        self.update_members_status(members_id=self.base_id, value=1)
+        self.update_members_status(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
         response = self.members_update_status(token=self.token)
         self.check_code(response=response, code=2003)
         self.check_msg(response=response, msg="账户已被禁用")