20190829

case/TTtest_jfa_tc03.py

@@ -25,7 +25,7 @@ class TestmanagerRegister(unittest.TestCase):
         self.caseid = '%s-3' % (self.lab)
         self.testplanid = gl.get_value('test_plan_id')
         self.ip = gl.get_value('apiip')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("13501976019","REGISTER")
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","REGISTER")
         # 测试API地址
         self.url = '%s/api/v1/manager/managerRegister' % (self.ip)
 
@@ -39,8 +39,8 @@ class TestmanagerRegister(unittest.TestCase):
 
         # 测试API请求头设置
         self.payloadHeader = {
-            'Content-Type': "application/json",
-            'Authorization': self.token
+            'Content-Type': "application/json"
+            # 'Authorization': self.token
         }
         # 打印requests
         self.data = json.dumps(self.payloadData)

case/sendVerificationCode.py

@@ -12,14 +12,14 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-import case.login as clogin
+# import case.login as clogin
 import config.config
 
 
 
 def sendVerificationCode(phone,templateType):
     ip = gl.get_value('apiip')
-    token = clogin.testuserlogin()
+    # token = clogin.testuserlogin()
 
 
     #测试API地址
@@ -32,7 +32,7 @@ def sendVerificationCode(phone,templateType):
     #测试API请求头设置
     payloadHeader = {
         'Content-Type': 'application/json',
-        'Authorization': token
+        # 'Authorization': token
     }
     # print(payloadHeader)
 
@@ -44,14 +44,15 @@ def sendVerificationCode(phone,templateType):
     rd = r['data']
     smsToken = rd['smsToken']
     # print(smsToken)
-    return smsToken,token
-# (smstoken,token) = sendVerificationCode("FORGET_PASSWORD")
+    return smsToken
+# (smstoken) = sendVerificationCode("18021047680","REGISTER")
 # print(smstoken)
 # print(token)
+
 def checkVerificationCode(phone,templateType):
     ip = gl.get_value('apiip')
     # token = clogin.testuserlogin()
-    (smsToken,token) = sendVerificationCode(phone, templateType)
+    (smsToken) = sendVerificationCode(phone, templateType)
 
     #测试API地址
     url = '%s/api/v1/manager/checkVerificationCode' % (ip)
@@ -60,12 +61,9 @@ def checkVerificationCode(phone,templateType):
     payloadData = { "templateType": templateType,"smsToken":smsToken,"verifyCode":"888888"}
     # print(payloadData)
 
-    # print(payloadData)
-
     #测试API请求头设置
     payloadHeader = {
-        'Content-Type': 'application/json',
-        'Authorization': token
+        'Content-Type': 'application/json'
     }
     # print(payloadHeader)
 
@@ -74,8 +72,8 @@ def checkVerificationCode(phone,templateType):
     headers = payloadHeader
     r = gp.Runmain().send_post(url=url,data=data,headers=headers,verify=False)
     # print(r)
-    return smsToken,token
+    return smsToken
 
-# (smsToken,token) = checkVerificationCode("18021047680","FORGET_PASSWORD")
+# (smsToken) = checkVerificationCode("18021047680","FORGET_PASSWORD")
 # print(smsToken)
-# print(token)
+

case/test_jfa_tc02.py

@@ -24,7 +24,7 @@ class TestcheckVerificationCode(unittest.TestCase):
         self.lab = gl.get_value('lab')
         self.caseid = '%s-2' % (self.lab)
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","FORGET_PASSWORD")
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","FORGET_PASSWORD")
         self.ip = gl.get_value('apiip')
         # 测试API地址
         self.url = '%s/api/v1/manager/checkVerificationCode' % (self.ip)

case/test_jfa_tc09.py

@@ -25,7 +25,7 @@ class TestresetPassword(unittest.TestCase):
         self.caseid = '%s-9' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.checkVerificationCode("18021047680","FORGET_PASSWORD")
+        (self.smstoken) = csendvc.checkVerificationCode("18021047680","FORGET_PASSWORD")
 
 
         self.ip = gl.get_value('apiip')
@@ -43,8 +43,7 @@ class TestresetPassword(unittest.TestCase):
 
         # 测试API请求头设置
         self.payloadHeader = {
-            'Content-Type': "application/json",
-            'Authorization': self.token
+            'Content-Type': "application/json"
         }
 
 

case/test_jfa_tc15.py

@@ -11,6 +11,7 @@ import util.test_get_post as gp
 import json
 import util.globalv as gl
 import case.sendVerificationCode as csendvc
+import case.login as clogin
 import unittest
 import util.reporyresult as cr
 import config.config
@@ -25,7 +26,8 @@ class TestresetPassword(unittest.TestCase):
         self.caseid = '%s-15' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.checkVerificationCode("18021047680","CHANGE_PASSWORD")
+        self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.checkVerificationCode("18021047680","CHANGE_PASSWORD")
 
 
         self.ip = gl.get_value('apiip')

case/test_jfa_tc17.py

@@ -10,7 +10,7 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-# import case.login as clogin
+import case.login as clogin
 import case.sendVerificationCode as csendvc
 import unittest
 import util.reporyresult as cr
@@ -26,8 +26,8 @@ class TestsmsCodeLogin(unittest.TestCase):
         self.caseid = '%s-17' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","LOGIN")
-        # self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","LOGIN")
+        self.token = clogin.testuserlogin()
 
         self.ip = gl.get_value('apiip')
         # 测试API地址

case/test_jfa_tc18.py

@@ -10,7 +10,7 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-# import case.login as clogin
+import case.login as clogin
 import case.sendVerificationCode as csendvc
 import unittest
 import util.reporyresult as cr
@@ -26,8 +26,8 @@ class TestupdateNickName(unittest.TestCase):
         self.caseid = '%s-18' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","LOGIN")
-        # self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","LOGIN")
+        self.token = clogin.testuserlogin()
 
         self.ip = gl.get_value('apiip')
         # 测试API地址

case/test_jfa_tc22.py

@@ -10,7 +10,7 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-# import case.login as clogin
+import case.login as clogin
 import case.sendVerificationCode as csendvc
 import unittest
 import util.reporyresult as cr
@@ -26,8 +26,8 @@ class TestgetProductList(unittest.TestCase):
         self.caseid = '%s-22' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","LOGIN")
-        # self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","LOGIN")
+        self.token = clogin.testuserlogin()
 
         self.ip = gl.get_value('apiip')
         # 测试API地址

case/test_jfa_tc23.py

@@ -10,7 +10,7 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-# import case.login as clogin
+import case.login as clogin
 import case.sendVerificationCode as csendvc
 import unittest
 import util.reporyresult as cr
@@ -26,8 +26,8 @@ class TestgetCustomerInfo(unittest.TestCase):
         self.caseid = '%s-23' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","LOGIN")
-        # self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","LOGIN")
+        self.token = clogin.testuserlogin()
 
         self.ip = gl.get_value('apiip')
         # 测试API地址

case/test_jfa_tc24.py

@@ -10,7 +10,7 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-# import case.login as clogin
+import case.login as clogin
 import case.sendVerificationCode as csendvc
 import unittest
 import util.reporyresult as cr
@@ -26,8 +26,8 @@ class TesteditCustomerRemark(unittest.TestCase):
         self.caseid = '%s-24' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","LOGIN")
-        # self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","LOGIN")
+        self.token = clogin.testuserlogin()
 
         self.ip = gl.get_value('apiip')
         # 测试API地址

case/test_jfa_tc26.py

@@ -10,7 +10,7 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-# import case.login as clogin
+import case.login as clogin
 import case.sendVerificationCode as csendvc
 import unittest
 import util.reporyresult as cr
@@ -26,8 +26,8 @@ class TestgetCustomerOrders(unittest.TestCase):
         self.caseid = '%s-26' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","LOGIN")
-        # self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","LOGIN")
+        self.token = clogin.testuserlogin()
 
         self.ip = gl.get_value('apiip')
         # 测试API地址

case/test_jfa_tc27.py

@@ -10,7 +10,7 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-# import case.login as clogin
+import case.login as clogin
 import case.sendVerificationCode as csendvc
 import unittest
 import util.reporyresult as cr
@@ -26,8 +26,8 @@ class TestgetCustomers(unittest.TestCase):
         self.caseid = '%s-27' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","LOGIN")
-        # self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","LOGIN")
+        self.token = clogin.testuserlogin()
 
         self.ip = gl.get_value('apiip')
         # 测试API地址

case/test_jfa_tc28.py

@@ -10,7 +10,7 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-# import case.login as clogin
+import case.login as clogin
 import case.sendVerificationCode as csendvc
 import unittest
 import util.reporyresult as cr
@@ -26,8 +26,8 @@ class TestgetAssets(unittest.TestCase):
         self.caseid = '%s-28' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","LOGIN")
-        # self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","LOGIN")
+        self.token = clogin.testuserlogin()
 
         self.ip = gl.get_value('apiip')
         # 测试API地址

case/test_jfa_tc29.py

@@ -10,7 +10,7 @@
 import util.test_get_post as gp
 import json
 import util.globalv as gl
-# import case.login as clogin
+import case.login as clogin
 import case.sendVerificationCode as csendvc
 import unittest
 import util.reporyresult as cr
@@ -26,8 +26,8 @@ class TestgetCashFlows(unittest.TestCase):
         self.caseid = '%s-28' % (self.lab)
 
         self.testplanid = gl.get_value('test_plan_id')
-        (self.smstoken,self.token) = csendvc.sendVerificationCode("18021047680","LOGIN")
-        # self.token = clogin.testuserlogin()
+        (self.smstoken) = csendvc.sendVerificationCode("18021047680","LOGIN")
+        self.token = clogin.testuserlogin()
 
         self.ip = gl.get_value('apiip')
         # 测试API地址

config/config.py

@@ -21,6 +21,7 @@ gl.set_value('test_plan_id','2042')  #//正式
 #设置APIIP地址
 gl.set_value('apiip','http://csptest.thiztech.com:7001')
 
+# gl.set_value('apiip','http://192.168.68.205:8092')
 
 #设置环境lab
 gl.set_value('lab','jfaaa') #正式

report/result.html

@@ -181,8 +181,8 @@
         
     <div class='page-header'>
         <h1>自动化测试报告,测试结果如下：</h1>
-    <p class='attribute'><strong>开始时间:</strong> 2019-08-15 10:06:18</p>
-<p class='attribute'><strong>运行时长:</strong> 0:00:32.875881</p>
+    <p class='attribute'><strong>开始时间:</strong> 2019-08-29 18:16:11</p>
+<p class='attribute'><strong>运行时长:</strong> 0:00:12.891737</p>
 <p class='attribute'><strong>状态:</strong> 通过 30</p>
 
     </div>
@@ -286,7 +286,7 @@
     <a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_pt5.1')" >
         通过</a>
     <div id='div_pt5.1' class="popup_window">
-        <pre>pt5.1: {'errMsg': 'OK', 'data': {'bankToken': 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZDRjZjRhOTM2MDI0YWY3MjlkZGY3ZTBjYzUzNjYyMjE3OTk5MWNhIiwiZXhwIjoxNTY1ODM1MDkzfQ.DPt8235MlXbqm0n4cuQUWDWYEwvTlHuTyO837dykdFhILcbcfWLDowf_6wpyHxwQSgsVnkdy1-YSzQlw4ZxuHg'}, 'errCode': 0}
+        <pre>pt5.1: {'errCode': 0, 'errMsg': 'OK', 'data': {'bankToken': 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZDRjZjRhOTM2MDI0YWY3MjlkZGY3ZTBjYzUzNjYyMjE3OTk5MWNhIiwiZXhwIjoxNTY3MDc0MDc2fQ.M6n9iXrzsX7fZTrZEbJSKR-Wglmuawa-xemO23Axr3jdtXP2tKDHoi2xveYmdVBqR5-fOttgjQrTu7CGAkik8Q'}}
 </pre>
     </div>
     <!--css div popup end-->

util/logger.py

@@ -29,7 +29,7 @@ class Logger(object):
         self.logger.addHandler(sh) #把对象加到logger里
         self.logger.addHandler(th)
 
-log = Logger('E:\\JFTpro\\jft_autotest\\log\\all.log',level='info')
+log = Logger('E:\\JFApro\\jfaappapi\\log\\all.log',level='info')
 # log = Logger('./log/all.log',level='info')
 # if __name__ == '__main__':
 #     log = Logger('all.log',level='debug')