兼容env，可通过jsoncase临时选取config

.gitignore

+./testCase
+./blueprints/KeyData
+

blueprints/KeyData

@@ -11,7 +11,7 @@ usered = qa
 defaluttime = 2
 timeout = 20
 phone_no = 13700000001
-environment = pre
+environment = test1
 term = 6
 amount = 10000
 productid = 1
@@ -22,15 +22,15 @@ amounts = [2000,4000,6000,10000,20000,30000]
 productids = [1,4]
 repaymenttypes = [微信,支付宝,银行卡]
 counter = 0
-totalamount = 4208.35
-loanid = 18
-totalloanamount = 1666.67
-termno = 4
+totalamount = 10182.07
+loanid = 320
+totalloanamount = 882.88
+termno = 1
 
 [globalvar]
 password = 123456aaa
 biztype = 0
-logindata = phone=13700000001
+logindata = None
 token = eb298e58-b438-4437-ab29-70973e7210a2
 passportapitoken = 1396bf28-64f4-44b6-9eec-bb334c08fc5e
 opapitoken = 5375b6c5-527e-4c3a-8c66-b9ef96a7412d
@@ -38,8 +38,8 @@ cardnoprovider = ICBC
 apitoken = 1396bf28-64f4-44b6-9eec-bb334c08fc5e
 mapitoken = 75d2421775d0b74ca27b28677bfa63410285
 quotarecordorderno = {'msg': None, 'code': '0000', 'data': []}
-hetongtoken = a758d7e9323225494c74a52b3a43af3e
-cardno = 6222020234701809463
+hetongtoken = 468dfce1b4ac1836a34dddaca5ea807e
+cardno = 6222020206041670466
 msgtoken = {token}
 sceneid = 5
 deadline = 1589164833000
@@ -55,7 +55,7 @@ cases_number1 = [816,817,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399
 case_number_fengkong = [509, 510, 511, 512, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549]
 case_number3 = [358, 359, 360,323,382, 383,399, 385,407,367,368,371,372,374,375,376,378,363,364,369,370,409,373,410,412,411,413,387, 388,389,390, 391, 392,389, 390, 394, 395, 396, 397]
 case_number_usercenter = [504, 494, 508,479, 477, 498, 476, 499, 495, 483, 505, 488, 471, 502, 484, 492, 493,  503, 470, 489, 473, 490, 486, 500, 501, 487, 491, 472, 496, 480, 506, 475, 474, 507, 481, 497, 478,482,485]
-person_test_number = cases_number1temp
+person_test_number = case_number_test
 cases_number_temp = [358, 359, 360,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399,407,367,368]
 case_number_33 = [358, 359, 360,323,383,385,399,367,372,378,363,364,369,370,409,373,410,412,411,413,387, 388,389,390, 391, 389, 390, 394, 395, 396, 397]
 case_number_newhetong = [416, 420, 421, 417, 426, 427, 431, 424, 432, 428, 425, 414, 422, 418, 419, 423, 415]
@@ -76,9 +76,10 @@ case_number_koala_risk = [{'koala_risk':[699]},{'usercenter':[500]},{'risk':[651
 case_number_koala_loan = [{'koala_loan':[672, 673, 674, 675, 676, 677, 678, 697, 698, 704]}]
 case_number_koala_repay = [{'koala_repay':[679, 680]}]
 case_number_ka_koala_loan = [{'ka_koala_loan':['803','802','801','800','798','799']}]
-case_number_ka_koala_repay = [{'ka_koala_repay':['791','789','790','786','787','788']}]
-case_number_test = [{'passportapi':[323,382,383,384]},{'koala_repay':[679, 680]},{'passportapi':[323,382,383,384]}]
+case_number_ka_koala_repay = [{'ka_koala_repay':['791','786','787','788','789','790']}]
+case_number_test11 = [{'passportapi':[323,382,383,384]},{'koala_repay':[679, 680]},{'passportapi':[323,382,383,384]}]
+case_number_test = [{'zhongtai_hetong':['277']}]
 
 [sqldata]
-sqldata = [0]
+sqldata = None
 

blueprints/exec-temp.py

@@ -158,7 +158,7 @@ if __name__ == '__main__':
 
     ##根据name值，从cases_mapping文件找对应的key
 
-    name='passportapi'
+    name='test'
     ###########################
 
     # name='account'

blueprints/requestResult.py

@@ -13,7 +13,7 @@ from blueprints.tools.dealScene import  dealScene
 from blueprints.tools.dealbody import requesturl,dealbodyHeaderType,deal_globalParam,setGloablValue,setup_step
 from blueprints.tools.rwKeyData import rwKeyData
 import requests,jsonpath,re,json,os,pickle
-from blueprints.settings import testConfig,qaConfig,ka2Config,qa2Config,test1Config,qa3Config,msgConfig
+from blueprints.settings import testConfig,qaConfig,ka2Config,qa2Config,test1Config,qa3Config,msgConfig,config as kconfig
 import warnings,demjson,base64,urllib3,time,html
 from blueprints.tools.debugtalk import finalexecaql
 from urllib.parse import  urlencode
@@ -27,8 +27,10 @@ class requestResult:
     def __init__(self,config,casefile):
         self.casefilemeta=casefile
         self.casefile=readCaseFile(casefile)
-        self.keydata = rwKeyData(config)
+
         self.config = config
+        self.config = kconfig.get(self.casefile.get('env')) or self.config
+        self.keydata = rwKeyData(config)
         #setGloablValue(self.keydata,self.casefile)
         self.casefile=deal_globalParam(self.config,self.casefile)
         #print(self.casefile)
@@ -40,6 +42,7 @@ class requestResult:
         self.keydata.deleteKeyData('circleData')
         setup_step(self.casefile)
 
+
     def person_timeout(self):
         msg={
             "code":"0001",
@@ -111,7 +114,7 @@ class requestResult:
             #print("==="*10,sql)
             sqlData=delDatabase(self.config,sql,db)
             self.keydata.writeKeyData('sqldata','sqldata',sqlData)
-            print("从表里查到的数据===", sqlData,self.casefile,sql)
+            #print("从表里查到的数据===", sqlData,self.casefile,sql)
 
             casejson = dealbodyHeaderType(self.config, self.casefile, sqlData)
             casejson =dealSign(casejson)
@@ -669,13 +672,13 @@ if __name__ == '__main__':
 
 
     #cases_number= [323, 382, 383, 384, 385,361, 402, 403, 404, 405,401]
-    cases_number=[373]
+    cases_number=[790]
     #cases_number = [369,370,409,373]
     #cases_number=[358, 359, 360,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399,407,367,368,371,372,374,375,376,378,363,364,369,370]
     t = '.json,'.join([str(i) for i in cases_number]) + ".json"
     # casefile = [{'passportapi':['323.json', '382.json','383.json', '384.json', '385.json']},{'payment': t.split(',')}]
 
-    casefile =[{'passportapi': t.split(',')}]
+    casefile =[{'ka_koala_repay': t.split(',')}]
 
     #casefile = [{'passportapi': t.split(',')}]
 

blueprints/settings.py

@@ -120,13 +120,25 @@ class ka2Config(baseConfig):
 class test1Config(baseConfig):
     namespace='test1'
     type="mysql"
-    host = "172.17.5.13"
+    host = "172.17.5.14"
     port = 31548
     user = "qa"
     pw = "qatest"
+    db = "xyqb_user"
+    charset="utf8"
+
+
+class test11Config(baseConfig):
+    namespace='test11'
+    type="mysql"
+    host = "172.18.3.85"
+    port = 3306
+    user = "all_test"
+    pw = "R1svoGpTfxQn7nCh"
     db = "xyqb"
     charset="utf8"
 
+
 class msgConfig(baseConfig):
     namespace='msg'
     type="mysql"
@@ -145,7 +157,8 @@ config={
     "test1":test1Config,
     "qa3":qa3Config,
     "msg":msgConfig,
-    'pre':preConfig
+    'pre':preConfig,
+    'test11':test11Config
 }
 
 

blueprints/testcases.py

@@ -17,11 +17,11 @@ class maintest(unittest.TestCase):
            suite.addTest(testcase_klass(name, config=config))
        return suite
 
-class passportapi0(maintest):
+class zhongtai_hetong0(maintest):
    def test_100(self):
-       res1=requestResult(self.config,'/Users/dm/Desktop/python_script/autoInterface/testCase/passportapi/373.json')
+       res1=requestResult(self.config,'/Users/dm/Desktop/python_script/autoInterface/testCase/zhongtai_hetong/277.json')
        res,finalresult=res1.requestJson()
-       t=readCaseFile('/Users/dm/Desktop/python_script/autoInterface/testCase/passportapi/373.json').get('result')
+       t=readCaseFile('/Users/dm/Desktop/python_script/autoInterface/testCase/zhongtai_hetong/277.json').get('result')
        r=0 if 0 in finalresult and len(finalresult)>0 else 1
        if r:
            self.detail=res1.keyoption()+('Success',)

blueprints/tools/debugtalk.py

@@ -58,7 +58,7 @@ def fakeinfo(k,flag=1):
                 k.append(b)
             bankcode=random.choice(k)
             c=bc.get(bankcode)+f.credit_card_number()
-            #print(c)
+            #print(c,bankcode)
             if len(c)>=20:
                 rw.writeKeyData('globalvar','cardNo'.lower(),c[0:19])
                 rw.writeKeyData('globalvar', 'cardNoProvider'.lower(), bankcode)
@@ -376,12 +376,13 @@ def clear_redis():
 
 
 if __name__ == '__main__':
-    # t=fakeinfo('cardNo')
+    t=fakeinfo('cardNo',flag=0)
+    print(t)
     # print(t,type(t))
     # # tt=fakeinfo('cardNoProvider')
     # # print(tt,type(tt))
     # print(getBankInfo('cardNoProvider'))
-    print(fakeinfo('idno'))
+    #print(fakeinfo('idno'))
     #print(fakeinfo('username'))
 
     # a=momeyRate('900',6,10000,2)
@@ -412,5 +413,5 @@ if __name__ == '__main__':
     #print(clear_redis())
 
     # print(momeyRate('10001',3,-15.12))
-    print(getCircle(right=[(20,'true'),(8,'false')]))
+    #print(getCircle(right=[(20,'true'),(8,'false')]))
 

blueprints/tools/zentaopms_cases.py

@@ -257,7 +257,7 @@ def zentaopms_data(panda_name,projectId,psid):
 if __name__ == "__main__":
 
 
-    names=['ka_koala_loan','payment']
+    names=['ka_koala_loan','payment','ka_koala_repay']
     #names=['zhongtai_hetong','msg','configuration_center']
 
     for name in names:

testCase/ka_koala_loan/800.json

@@ -3,12 +3,15 @@
     "commit": "提现（支持绑卡）(POST)",
     "url": "/v1/loan/submit",
     "casename": "token",
-    "sql": "select b.`user_id`,c.`tmpl_path`,\r\n'测试借款用途'\r\n as loanPurpose \r\nfrom `xyqb`.`quota_credit` b\r\ninner join xyqb.funding_contract c\r\nwhere b.`order_no`='AN000000143183669801000960'\r\nand c.`funding_corp_id`=100010;",
+    "sql": "select b.`user_id`,c.`tmpl_path`,\r\n'测试借款用途'\r\n as loanPurpose \r\nfrom `xyqb`.`quota_credit` b\r\ninner join xyqb.funding_contract c\r\nwhere b.`order_no`='{{applyno}}'\r\nand c.`funding_corp_id`=100010;",
     "db": "xyqb",
     "result": {
         "code": "0"
     },
     "type": "koala",
+    "setup": {
+        "a": "clear_redis()"
+    },
     "body": {
         "userId": "%s",
         "channelId": "{{channnelid}}",

testCase/ka_koala_loan/820.json

+{
+    "method": "GET",
+    "commit": "考拉查询借款清单接口(GET)",
+    "url": "/v1/loan/manifest",
+    "casename": "token",
+    "sql": "select a.`loan_application_history_id`\r\nfrom xyqb.loan_application_manifest_history  a\r\ninner join xyqb_user.user b\r\non a.`user_id`=b.`id`\r\nwhere b.`phone_no`='{{phone_no}}'; ",
+    "db": "xyqb",
+    "result": {
+        "code": "0"
+    },
+    "type": "koala",
+    "body": {
+        "loanId": "%s"
+    },
+    "header": {
+        "Content-Type": "application/x-www-form-urlencoded"
+    }
+}
\ No newline at end of file

testCase/ka_koala_loan/821.json

+{
+    "method": "POST",
+    "commit": "考拉通知资金系统创建待放款申请单(POST)",
+    "url": "/v1/dummy/clotho/notify",
+    "casename": "token",
+    "sql": "select a.`uuid`,b.id as bizNo, 0 as bizType from xyqb.`apply_quota_record` a \r\ninner join  xyqb.`loan_application_history` b\r\non a.`user_id`=b.`user_id`\r\nwhere `order_no`='{{applyno}}';",
+    "db": "xyqb",
+    "result": {
+        "code": "0"
+    },
+    "type": "koala",
+    "body": {
+        "code": "0",
+        "msg": "success",
+        "bizChannel": "{{channelId}}",
+        "uuid": "%s",
+        "bizNo": "%s",
+        "bizType": "%s",
+        "auditResult": "true",
+        "deadLine": "1591545600000"
+    },
+    "header": {
+        "Content-Type": "application/json"
+    }
+}
\ No newline at end of file

testCase/ka_koala_repay/786.json

@@ -3,7 +3,7 @@
     "commit": "还款计划查询(GET)",
     "url": "/v1/repayment/plan",
     "casename": "token",
-    "sql": "select a.id from xyqb.`loan_application_history` a \r\ninner join xyqb.`loan_application_manifest_history` b\r\non a.id=b.`loan_application_history_id`\r\nwhere a.progress=15 and a.`is_active`=1 and   b.`funding_corp_id`=630 order by rand() limit 1;",
+    "sql": "select a.id from xyqb.`loan_application_history` a \r\ninner join xyqb.`loan_application_manifest_history` b\r\non a.id=b.`loan_application_history_id`\r\nwhere a.progress=15 and a.`is_active`=1 and   b.`funding_corp_id`=100010 order by a.id desc limit 1;",
     "db": "xyqb",
     "result": {
         "code": "0",
@@ -17,4 +17,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/787.json

@@ -3,7 +3,7 @@
     "commit": "发起还款(API)(POST)",
     "url": "/v1/repayment/pay",
     "casename": "token",
-    "sql": "select distinct d.`loan_application_history_id`,p1.card_no, 0 as noncestr,0 as timestamp ,\r\n0 as sign,0 as app_id,c.`name`,c.`id_no`,c.`phone_no` from xyqb_user.`user_detail`c\r\ninner join xyqb.`loan_application_manifest_history` d\r\nINNER JOIN xyqb.loan_application_history a\r\nINNER JOIN xyqb.repayment_plan e \r\nINNER JOIN payment_center.card_bind_info p1\r\nINNER JOIN payment_center.user p2\r\non  a.id=d.loan_application_history_id and  p1.user_id=p2.id and p2.xyqb_uid=c.user_id and p2.xyqb_uid=a.user_id and \r\ne.loan_application_history_id=d.loan_application_history_id\r\nwhere  d.`funding_corp_id`=630 and d.`loan_application_history_id`={{sqldata_0}}   and a.progress=15   order by rand() limit 1;",
+    "sql": "select distinct d.`loan_application_history_id`,p1.card_no, 0 as noncestr,0 as timestamp ,\r\n0 as sign,0 as app_id,c.`name`,c.`id_no`,c.`phone_no` from xyqb_user.`user_detail`c\r\ninner join xyqb.`loan_application_manifest_history` d\r\nINNER JOIN xyqb.loan_application_history a\r\nINNER JOIN xyqb.repayment_plan e \r\nINNER JOIN payment_center.card_bind_info p1\r\nINNER JOIN payment_center.user p2\r\non  a.id=d.loan_application_history_id and  p1.user_id=p2.id and p2.xyqb_uid=c.user_id and p2.xyqb_uid=a.user_id and \r\ne.loan_application_history_id=d.loan_application_history_id\r\nwhere  d.`funding_corp_id`=100010 and d.`loan_application_history_id`={{sqldata_0}}   and a.progress=15   order by rand() limit 1;",
     "db": "xyqb",
     "result": {
         "code": "0"
@@ -29,4 +29,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/788.json

@@ -17,4 +17,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/789.json

@@ -3,7 +3,7 @@
     "commit": "提前结清还款试算(GET)",
     "url": "/v1/repayment/early_settlement/plan",
     "casename": "token",
-    "sql": "select a.id from xyqb.`loan_application_history` a \r\ninner join xyqb.`loan_application_manifest_history` b\r\non a.id=b.`loan_application_history_id`\r\nwhere a.progress=15 and a.`is_active`=1 and  a.id=18 and b.`funding_corp_id`=100010 order by rand() limit 1;",
+    "sql": "select a.id from xyqb.`loan_application_history` a \r\ninner join xyqb.`loan_application_manifest_history` b\r\non a.id=b.`loan_application_history_id`\r\nwhere a.progress=15 and a.`is_active`=1  and b.`funding_corp_id`=100010 order by a.id desc limit 1;",
     "db": "xyqb",
     "result": {
         "code": "0",
@@ -16,4 +16,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/790.json

@@ -30,4 +30,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/791.json

@@ -3,7 +3,7 @@
     "commit": "提前结清结果查询(GET)",
     "url": "/v1/repayment/early_settlement/query",
     "casename": "token",
-    "sql": "select b.`loan_application_history_id`,a.`business_flow_no`\r\nfrom xyqb.`pay_order` a \r\ninner join xyqb.`repayment_record` b\r\ninner join xyqb.`loan_application_manifest_history` c\r\non a.`pay_order_no`=b.`repayment_plan_id`\r\nand b.`loan_application_history_id`=c.`loan_application_history_id`\r\nwhere b.loan_application_history_id=17\r\norder by rand() limit 1;",
+    "sql": "select a.loan_application_history_id,b.business_flow_no from xyqb.repayment_order a\r\njoin xyqb.pay_order b  on a.id=b.business_id where a.repay_type=8\r\norder by rand() limit 1;",
     "db": "xyqb",
     "result": {
         "code": "0",
@@ -17,4 +17,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/688.json

@@ -16,4 +16,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/763.json

@@ -18,4 +18,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/764.json

@@ -17,4 +17,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/819.json

@@ -18,4 +18,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/zhongtai_hetong/277.json

@@ -9,6 +9,7 @@
     },
     "type": "hetong",
     "execjsonversion": "1.0.1",
+    "env":"test11",
     "body": {
         "sourceId": "%s",
         "templateId": "%s"
@@ -16,4 +17,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file