更新

liujiqiang
1 parent 2bc04883
Showing 15 changed files with 252 additions and 182 deletions
commons/scripts/delReport.py
main.py
report/cardSystem/__init__.py
report/cardSystem/test_addCard.py
testCase/cardSystem/test_cardStorage.py → report/cardSystem/test_cardStorage.py
testCase/cardSystem/test_changeCard.py → report/cardSystem/test_changeCard.py
testCase/cardSystem/test_lossCard.py → report/cardSystem/test_lossCard.py
testCase/cardSystem/test_openMasterCard.py → report/cardSystem/test_openMasterCard.py
testCase/cardSystem/test_openSlaveCard.py → report/cardSystem/test_openSlaveCard.py
testCase/cardSystem/test_outCard.py → report/cardSystem/test_outCard.py
testCase/cardSystem/test_pwdModify.py → report/cardSystem/test_pwdModify.py
testCase/cardSystem/test_pwdReset.py → report/cardSystem/test_pwdReset.py
report/test.log
testCase/cardSystem/test_addCard.py
testCase/main.py
@@ -11,20 +11,22 @@
 import os,sys
-def delReport(path,delNum=5):
-    # print("path",path)
-    if os.name == "nt":
-        report_route = os.path.abspath(os.path.join(path, "../"))
+def path_route(path):
+    if "report" not in os.listdir(path):
+        return path_route(os.path.abspath(os.path.join(path, "../")))
     else:
-        report_route = os.path.abspath(os.path.join(path))
-    file_list = os.listdir(report_route + "/report/")
-    # print("delReport file_lis ---   ", file_list)
+        return path
+
+def delReport(path,delNum=5):
+    project_path = path_route(path)
+    file_list = os.listdir(project_path + "/report/")
+    print("delReport file_lis ---   ", file_list)
     if len(file_list) > delNum:
         file_list = file_list[:0-delNum]
         # print("if file_lis ---   ",file_list)
         for i in file_list:
-            if os.path.isfile(report_route + "/report/" + i) and ".log" not in i:
-                os.remove(report_route + "/report/" + i)
+            if os.path.isfile(project_path + "/report/" + i) and ".log" not in i:
+                os.remove(project_path + "/report/" + i)
                 print(f"删除报告    {i}     成功")
         # 文件已删除
         print("多余的报告文件已删除")
@@ -37,7 +37,7 @@ def Create_Testcase_suite():
 def Run_Testcase(testsuit):
     '''运行测试用例并生成报告'''
     now = time.strftime("%Y-%m-%d %H_%M_%S", time.localtime())
-    path = os.path.dirname(os.path.abspath(sys.argv[0]))
+    path = os.path.dirname(__file__)
     report_file = os.path.abspath(os.path.join(path))+ "/report/" + now + "_result.html"
     # 创建报告文件
     fp = open(report_file, 'wb')
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/16 14:36
+# @Author  : Ljq
+# @File    : __init__.py.py
+# @Software: PyCharm
+
+"""
+
+"""
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/16 14:44
+# @Author  : Ljq
+# @File    : test_addCard.py
+# @Software: PyCharm
+
+"""
+卡片入库测试
+"""
+
+import unittest
+import time
+import math
+import commons.api.cardStorageIn as cSI
+import commons.api.cardStock as cS
+import commons.api.cardStorageOut as cSO
+from commons.scripts.readConf import readConfig
+from commons.api.doLogin import doLogin
+
+
+class test_addCard(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        # 获取登录信息和可用headers
+        rC = readConfig()
+        cls.cardHost = rC.returnOptionsItems("host", "cardHost")
+        cls.webHeaders,cls.clientHeaders,cls.userInfo = doLogin().loginUser()
+        cls.applyUserName = cls.userInfo["data"]["user"]["realName"]
+        cls.applyUserId = cls.userInfo["data"]["user"]["id"]
+        cls.applyUserCode = cls.userInfo["data"]["user"]["userName"]
+        # print("self.webHeaders", cls.webHeaders)
+        # print("self.clientHeaders", cls.clientHeaders)
+        # print("self.userInfo", cls.userInfo)
+
+    def setUp(self) -> None:
+        time.sleep(2)
+
+    def test_cardType(self):
+        """
+        卡类型校验
+        :return:
+        """
+        resCardType = cSI.getCardType(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        preRes = [{"text":"-- 全部 --","value":""},{"text":"主卡","value":10},{"text":"副卡","value":20}]
+        assert resCardType.json()==preRes,"卡类型信息错误"
+
+    def test_cardFaceCheck(self):
+        """
+        市场卡面信息校验
+        :return:
+        """
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        print(resCardFace.json())
+        if self.userInfo["data"]["user"]["firmId"] == 8:
+            # 预期结果定义
+            preRes = [{'text': '-- 请选择 --', 'value': ''}, {'text': '买方卡', 'value': 'buyer'}, {'text': 'VIP买方卡', 'value': 'buyer_vip'}, {'text': '卖方卡', 'value': 'seller'}, {'text': '司机卡', 'value': 'driver'}]
+            assert resCardFace.json()==preRes,"当 firmId = 8 时卡面信息错误"
+        else:
+            preRes = [{"text":"-- 无--","value":""}]
+            assert resCardFace.json() == preRes, "当 firmId != 8 时卡面信息错误"
+
+    def test_doCardStorageIn(self):
+        """
+        卡片入库测试，新添加的卡片能正常的入库
+        :return:
+        """
+        # 获取卡面信息
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        # 执行入库
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        # print(resSavaCard.json())
+        assert resSavaCard.json()["message"]=="OK","入库失败"
+        resQueryList = cSI.queryList(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        # 入库卡片号段校验
+        assert resQueryList.json()["rows"][0]["cardNoRange"]==str(startCardNo)+"-"+str(endCardNo),"入库的卡片在入库列表不能被查询到"
+        # 入库数量校验
+        assert resQueryList.json()["rows"][0]["amount"]==2,"入库数量错误"
+        # 入库角色校验
+        assert resQueryList.json()["rows"][0]["creator"]==self.userInfo["data"]["user"]["realName"],"入库角色记录正确"
+        assert resQueryList.json()["rows"][0]["creatorId"] == self.userInfo["data"]["user"]["id"], "入库角色记录正确"
+        # resQueryList.json()["rows"][0]["cardFaceText"]
+        if self.userInfo["data"]["user"]["firmId"] == 8:
+            assert cardFace==resQueryList.json()["rows"][0]["cardFace"],"记录的卡面信息与实际卡面不一致"
+        else:
+            assert "cardFaceText" not in resQueryList.text,"记录的卡面信息与实际卡面不一致"
+
+    def test_duplicateStorageIn(self):
+        """
+        测试卡片不能被重复入库
+        :return:
+        """
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        assert resSavaCard.json()["message"]=="OK","入库失败"
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        assert resSavaCard.json()["message"]=="入库失败，包含重复卡号%s~%s"%(startCardNo,endCardNo),"卡片不能重复入库验证失败"
+
+    def test_openCardStorageIn(self):
+        """
+        入库列表查询测试
+        :return:
+        """
+        # 全列表查询
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        # print(resQueryList.json()["total"])
+        assert resQueryList.json()["total"]>200,"页数小于10，查询结果可能存在错误"
+
+        # 查询当天入库的入库记录，判断所得的查询记录的日期都是当天的为测试通过
+        startDate = str(time.strftime("%Y-%m-%d 00:00:00", time.localtime()))
+        endDate = str(time.strftime("%Y-%m-%d 23:59:59", time.localtime()))
+        resQueryLista = cSI.queryList(cardHost=self.cardHost,webHeaders=self.webHeaders,startDate=startDate,endDate=endDate)
+        dateList=[]
+        pageNums = math.ceil(resQueryLista.json()["total"]/10)
+        for pageNum in range(pageNums):
+            resQueryLista = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders, startDate=startDate,
+                                          endDate=endDate,page=str(pageNum+1))
+            dateList = dateList+[i["createTime"] for i in resQueryLista.json()["rows"]]
+        assert [] == [i for i in dateList if i<startDate or i>endDate],"查询结果错误，查询出非当天的入库信息"
+
+    def test_addMasterCard(self):
+        """
+        添加主卡
+        :return:
+        """
+        resCardType = cSI.getCardType(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        assert resQueryList.json()["rows"][0]["cardType"]==10,"卡片类型错误"
+
+
+    def test_addSlaveCard(self):
+        """
+        添加副卡
+        :return:
+        """
+        resCardType = cSI.getCardType(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardType=20)
+        print(resSavaCard.json())
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        assert resQueryList.json()["rows"][0]["cardType"] == 20, "卡片类型错误"
+        assert resQueryList.json()["rows"][0]["cardTypeText"] == "副卡", "卡片类型错误"
+        assert "cardFaceText" not in str(resQueryList.json()["rows"][0]),"副卡不应该存在卡面"
+
+
+    def test_delStorageInRecord(self):
+        """
+        正常删除卡片记录
+        :return:
+        """
+        # 新增加一条入库记录用于删除
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        assert resSavaCard.json()["message"]=="OK","入库失败"
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        ida = resQueryList.json()['rows'][0]['id']
+        resDel = cSI.delCard(cardHost=self.cardHost,webHeaders=self.webHeaders,ids=ida)
+        assert resDel.json()["message"]=="OK","删除失败，入库记录未被成功删除"
+        resQueryListB = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        idb = resQueryListB.json()['rows'][0]['id']
+        print(ida,"----------------",idb)
+        assert ida!=idb,"删除功能异常，记录未被删除"
+
+    def test_delStorageInRecordFail_delCard(self):
+        """
+        已作废的卡片不能被删除
+        :return:
+        """
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        # 卡片作废
+        cS.cardVoid(cardHost=self.cardHost,webHeaders=self.webHeaders,cardNo=startCardNo)
+        # 删除入库记录
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        ida = resQueryList.json()['rows'][0]['id']
+        resDel = cSI.delCard(cardHost=self.cardHost, webHeaders=self.webHeaders, ids=ida)
+        print(resDel.json())
+        assert resDel.json()["message"]=="有部分卡片已出库或作废，删除失败","已作废的卡片不能被删除"
+
+    def test_delStorageInRecordFail_cardOut(self):
+        """
+        存在出库卡片的入库记录，不能进行删除
+        :return:
+        """
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        # 卡片出库
+        acc = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=str(startCardNo),applyUserName=self.applyUserName,applyUserCode=self.applyUserCode,applyUserId=self.applyUserId)
+        # print(acc.json())
+        # 删除入库记录
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        ida = resQueryList.json()['rows'][0]['id']
+        resDel = cSI.delCard(cardHost=self.cardHost, webHeaders=self.webHeaders, ids=ida)
+        # print(resDel.json())
+        assert resDel.json()["message"] == "有部分卡片已出库或作废，删除失败", "已出库的卡片不能被删除"
+
+    @classmethod
+    def tearDownClass(cls):
+        print("tearDown")
+
+    def tearDown(self) -> None:
+        pass
+
+if __name__== "__main__":
+    unittest.main()
 \ No newline at end of file
+[2021-07-21 10:39:13] [INFO] : 发送邮件
+[2021-07-21 10:39:15] [INFO] : 邮件发送完毕
@@ -45,177 +45,6 @@ class test_addCard(unittest.TestCase):
         preRes = [{"text":"-- 全部 --","value":""},{"text":"主卡","value":10},{"text":"副卡","value":20}]
         assert resCardType.json()==preRes,"卡类型信息错误"
-    def test_cardFaceCheck(self):
-        """
-        市场卡面信息校验
-        :return:
-        """
-        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
-        print(resCardFace.json())
-        if self.userInfo["data"]["user"]["firmId"] == 8:
-            # 预期结果定义
-            preRes = [{'text': '-- 请选择 --', 'value': ''}, {'text': '买方卡', 'value': 'buyer'}, {'text': 'VIP买方卡', 'value': 'buyer_vip'}, {'text': '卖方卡', 'value': 'seller'}, {'text': '司机卡', 'value': 'driver'}]
-            assert resCardFace.json()==preRes,"当 firmId = 8 时卡面信息错误"
-        else:
-            preRes = [{"text":"-- 无--","value":""}]
-            assert resCardFace.json() == preRes, "当 firmId != 8 时卡面信息错误"
-
-    def test_doCardStorageIn(self):
-        """
-        卡片入库测试，新添加的卡片能正常的入库
-        :return:
-        """
-        # 获取卡面信息
-        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
-        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
-        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
-        endCardNo = startCardNo + 1
-        # 执行入库
-        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
-        # print(resSavaCard.json())
-        assert resSavaCard.json()["message"]=="OK","入库失败"
-        resQueryList = cSI.queryList(cardHost=self.cardHost,webHeaders=self.webHeaders)
-        # 入库卡片号段校验
-        assert resQueryList.json()["rows"][0]["cardNoRange"]==str(startCardNo)+"-"+str(endCardNo),"入库的卡片在入库列表不能被查询到"
-        # 入库数量校验
-        assert resQueryList.json()["rows"][0]["amount"]==2,"入库数量错误"
-        # 入库角色校验
-        assert resQueryList.json()["rows"][0]["creator"]==self.userInfo["data"]["user"]["realName"],"入库角色记录正确"
-        assert resQueryList.json()["rows"][0]["creatorId"] == self.userInfo["data"]["user"]["id"], "入库角色记录正确"
-        # resQueryList.json()["rows"][0]["cardFaceText"]
-        if self.userInfo["data"]["user"]["firmId"] == 8:
-            assert cardFace==resQueryList.json()["rows"][0]["cardFace"],"记录的卡面信息与实际卡面不一致"
-        else:
-            assert "cardFaceText" not in resQueryList.text,"记录的卡面信息与实际卡面不一致"
-
-    def test_duplicateStorageIn(self):
-        """
-        测试卡片不能被重复入库
-        :return:
-        """
-        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
-        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
-        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
-        endCardNo = startCardNo+1
-        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
-        assert resSavaCard.json()["message"]=="OK","入库失败"
-        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
-        assert resSavaCard.json()["message"]=="入库失败，包含重复卡号%s~%s"%(startCardNo,endCardNo),"卡片不能重复入库验证失败"
-
-    def test_openCardStorageIn(self):
-        """
-        入库列表查询测试
-        :return:
-        """
-        # 全列表查询
-        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
-        # print(resQueryList.json()["total"])
-        assert resQueryList.json()["total"]>200,"页数小于10，查询结果可能存在错误"
-
-        # 查询当天入库的入库记录，判断所得的查询记录的日期都是当天的为测试通过
-        startDate = str(time.strftime("%Y-%m-%d 00:00:00", time.localtime()))
-        endDate = str(time.strftime("%Y-%m-%d 23:59:59", time.localtime()))
-        resQueryLista = cSI.queryList(cardHost=self.cardHost,webHeaders=self.webHeaders,startDate=startDate,endDate=endDate)
-        dateList=[]
-        pageNums = math.ceil(resQueryLista.json()["total"]/10)
-        for pageNum in range(pageNums):
-            resQueryLista = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders, startDate=startDate,
-                                          endDate=endDate,page=str(pageNum+1))
-            dateList = dateList+[i["createTime"] for i in resQueryLista.json()["rows"]]
-        assert [] == [i for i in dateList if i<startDate or i>endDate],"查询结果错误，查询出非当天的入库信息"
-
-    def test_addMasterCard(self):
-        """
-        添加主卡
-        :return:
-        """
-        resCardType = cSI.getCardType(cardHost=self.cardHost,webHeaders=self.webHeaders)
-        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
-        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
-        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
-        endCardNo = startCardNo+1
-        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
-        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
-        assert resQueryList.json()["rows"][0]["cardType"]==10,"卡片类型错误"
-
-
-    def test_addSlaveCard(self):
-        """
-        添加副卡
-        :return:
-        """
-        resCardType = cSI.getCardType(cardHost=self.cardHost,webHeaders=self.webHeaders)
-        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
-        endCardNo = startCardNo+1
-        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardType=20)
-        print(resSavaCard.json())
-        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
-        assert resQueryList.json()["rows"][0]["cardType"] == 20, "卡片类型错误"
-        assert resQueryList.json()["rows"][0]["cardTypeText"] == "副卡", "卡片类型错误"
-        assert "cardFaceText" not in str(resQueryList.json()["rows"][0]),"副卡不应该存在卡面"
-
-
-    def test_delStorageInRecord(self):
-        """
-        正常删除卡片记录
-        :return:
-        """
-        # 新增加一条入库记录用于删除
-        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
-        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
-        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
-        endCardNo = startCardNo + 1
-        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
-        assert resSavaCard.json()["message"]=="OK","入库失败"
-        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
-        ida = resQueryList.json()['rows'][0]['id']
-        resDel = cSI.delCard(cardHost=self.cardHost,webHeaders=self.webHeaders,ids=ida)
-        assert resDel.json()["message"]=="OK","删除失败，入库记录未被成功删除"
-        resQueryListB = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
-        idb = resQueryListB.json()['rows'][0]['id']
-        print(ida,"----------------",idb)
-        assert ida!=idb,"删除功能异常，记录未被删除"
-
-    def test_delStorageInRecordFail_delCard(self):
-        """
-        已作废的卡片不能被删除
-        :return:
-        """
-        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
-        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
-        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
-        endCardNo = startCardNo+1
-        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
-        # 卡片作废
-        cS.cardVoid(cardHost=self.cardHost,webHeaders=self.webHeaders,cardNo=startCardNo)
-        # 删除入库记录
-        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
-        ida = resQueryList.json()['rows'][0]['id']
-        resDel = cSI.delCard(cardHost=self.cardHost, webHeaders=self.webHeaders, ids=ida)
-        print(resDel.json())
-        assert resDel.json()["message"]=="有部分卡片已出库或作废，删除失败","已作废的卡片不能被删除"
-
-    def test_delStorageInRecordFail_cardOut(self):
-        """
-        存在出库卡片的入库记录，不能进行删除
-        :return:
-        """
-        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
-        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=3)
-        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
-        endCardNo = startCardNo + 1
-        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
-                                   endCardNo=endCardNo, cardFace=cardFace)
-        # 卡片出库
-        acc = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=str(startCardNo),applyUserName=self.applyUserName,applyUserCode=self.applyUserCode,applyUserId=self.applyUserId)
-        # print(acc.json())
-        # 删除入库记录
-        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
-        ida = resQueryList.json()['rows'][0]['id']
-        resDel = cSI.delCard(cardHost=self.cardHost, webHeaders=self.webHeaders, ids=ida)
-        # print(resDel.json())
-        assert resDel.json()["message"] == "有部分卡片已出库或作废，删除失败", "已出库的卡片不能被删除"
-
     @classmethod
     def tearDownClass(cls):
         print("tearDown")
@@ -37,7 +37,7 @@ def Create_Testcase_suite():
 def Run_Testcase(testsuit):
     '''运行测试用例并生成报告'''
     now = time.strftime("%Y-%m-%d %H_%M_%S", time.localtime())
-    path = os.path.dirname(os.path.abspath(sys.argv[0]))
+    path = os.path.dirname(os.path.abspath(__file__))
     report_file = os.path.abspath(os.path.join(path, "../"))+ "/report/" + now + "_result.html"
     # 创建报告文件
     fp = open(report_file, 'wb')