登录

WorkCase/APP/Api/test_api_login.py

@@ -6,6 +6,8 @@
 
 from __future__ import division
 
+import time
+
 from WorkCase import CaseBase
 from WorkCase.APP import AppBase
 from WorkUtils.UtilsLog import UtilsLog
@@ -44,45 +46,15 @@ class TestApiLogin(object):
         self.log.debug("测试用例执行开始...")
 
         self.app = AppBase(host=self.host)
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["OFF"])
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["ON"])
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
 
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["OFF"])
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["ON"])
-
     @allure.step("连接数据库：Argus")
     def db_session(self):
         session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
         return session
 
-    @allure.step("断言返回结果：校验排序")
-    def check_sortfield(self, response, possible):
-        result = UtilsResponse().get_result(response=response)
-        UtilsResponse().check_sort(_list=result, key="groupid", possible=possible)
-
-    @allure.step("断言返回结果：校验返回数据的数量")
-    def check_num(self, response, num):
-        result = UtilsResponse().get_result(response=response)
-        assert len(result) == num
-
-    @allure.step("断言返回结果")
-    def check_code(self, response, code):
-        _code = UtilsResponse().get_code(response=response)
-        assert _code == code
-
-    @allure.step("断言返回错误信息")
-    def check_msg(self, response, msg):
-        _msg = UtilsResponse().get_msg(response=response)
-        assert _msg == msg
-
-    @allure.step("断言返回错误结果")
-    def check_status(self, response, status):
-        _status = UtilsResponse().get_status(response=response)
-        assert _status == status
-
     @allure.title("api.login：用户密码正确成功登录")
     @allure.story("登录：用户密码正确成功登录")
     @allure.severity("blocker")
@@ -107,21 +79,29 @@ class TestApiLogin(object):
     @allure.title("api.login：已删除的用户无法登录")
     @allure.story("登录：已删除的用户无法登录")
     def test_case_04(self):
-        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=1)
-
+        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
+        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["ON"])
+        time.sleep(10)
         response = self.app.api_login(name=self.base_name, password=self.base_password)
         self.app.check_code(response=response, code=2004)
         self.app.check_msg(response=response, msg="用户不存在")
 
+        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["ON"])
+
     @allure.title("api.login：已禁用的用户无法登录")
     @allure.story("登录：已禁用的用户无法登录")
     def test_case_05(self):
-        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=0)
-
+        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
+        time.sleep(10)
         response = self.app.api_login(name=self.base_name, password=self.base_password)
         self.app.check_code(response=response, code=2003)
         self.app.check_msg(response=response, msg="账户已被禁用")
 
+        self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["OFF"])
+        self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["ON"])
+
 
 if __name__ == "__main__":
     from WorkUtils.UtilsPyTest import UtilsPyTest

WorkCase/APP/__init__.py

@@ -499,13 +499,11 @@ class AppBase(object):
     @allure.step("更新表数据：members -- del_flag")
     def update_members_del_flag(self, session, members_id=None, value=None):
         sql = DataMembers().update_del_flag(session=session, _id=members_id, value=value)
-        time.sleep(10)
         return sql
 
     @allure.step("更新表数据：members -- status")
     def update_members_status(self, session, members_id=None, value=None):
         sql = DataMembers().update_status(session=session, _id=members_id, value=value)
-        time.sleep(10)
         return sql
 
     @allure.step("更新表数据：members -- password")