备注添加

liujiqiang
1 parent f9878f3e
Showing 4 changed files with 33 additions and 13 deletions
commons/MySession.py
commons/scripts/readConf.py
report/test.log
testcase/doAdd/test_doAddA.py
@@ -210,6 +210,6 @@ class mysession():
 my = mysession()
 my.set_mark()
-s1 = my.get_session("user01")
-# s2=my.get_session("user02")
 my.cliLogin()
+s1 = my.get_session("user01")
+s2 = my.get_session("user02")
 \ No newline at end of file
@@ -8,7 +8,6 @@
 """
 配置文件读取
 """
-
 import configparser
 import os
@@ -17,9 +16,10 @@ class readConfig(object):
     ROBOT_LIBRARY_VERSION = '0.1'
     def __init__(self):
+        # 按市场读取配置文件数据
         self.conf = configparser.ConfigParser()
         self.evn_name = os.name
-        self.file_name = r'test_config_hg'
+        self.file_name = r'test_config_hg.conf'
         self.relative_path = r'/config/marketConfig/'
         self.file_path = os.path.abspath(
             os.path.join(os.path.dirname(__file__), "../../")) + self.relative_path + self.file_name
@@ -27,20 +27,24 @@ class readConfig(object):
         self.conf.read(self.file_path,encoding="utf-8")
     def returnSections(self):
+        # 读取所有的options选项
         sections = self.conf.sections()
         print(sections)
         return sections
     def returnOptions(self,options):
+        # 通过options读取所有items
         options = self.conf.options(options)
         print(options)
         return options
-    def returnOptionsInfo(self,items):
-        items = self.conf.items(items)
+    def returnOptionsInfo(self,options):
+        # 通过options读取相关的items和value
+        items = self.conf.items(options)
         print(items)
     def returnOptionsItems(self,options,items):
+        # 通过options和items的组合关系读取对应的value
         value = self.conf.get(options,items)
         print(value)
         return value
@@ -49,4 +53,9 @@ class readConfig(object):
         print(self.file_path)
         return self.file_path
-# readConfig().returnOptionsItems("loginInfo","userName")
 \ No newline at end of file
+# rc = readConfig()
+# rc.returnSections()
+# rc.returnOptions("loginInfo")
+# rc.returnOptionsInfo("loginInfo")
+# rc.returnOptionsItems("loginInfo","username")
+# rc.ReturnFilePath()
 \ No newline at end of file
-[2021-07-20 14:27:04] [INFO] : ======================================================================================
-[2021-07-20 14:27:04] [INFO] : http://test.trace.diligrp.com:8393/fieldConfig/doUpdate.action
+[2021-07-20 14:36:11] [INFO] : ======================================================================================
+[2021-07-20 14:36:11] [INFO] : http://test.trace.diligrp.com:8393/fieldConfig/doUpdate.action
 None
 {'moduleType': '1', 'marketId': '8', 'fieldConfigDetailList': [{'fieldName': 'unitPrice', 'jsonPath': '$.unitPrice', 'defaultId': '3', 'displayed': '1', 'required': '0'}, {'fieldName': 'arrivalTallynos', 'jsonPath': '$.arrivalTallynos', 'defaultId': '10', 'displayed': '1', 'required': '0'}, {'fieldName': 'brandName', 'jsonPath': '$.brandName', 'defaultId': '5', 'displayed': '1', 'required': '0'}, {'fieldName': 'truckTareWeight', 'jsonPath': '$.truckTareWeight', 'defaultId': '1', 'displayed': '1', 'required': '0'}, {'fieldName': 'originId', 'jsonPath': '$.originId', 'defaultId': '7', 'displayed': '1', 'required': '0'}, {'fieldName': 'specName', 'jsonPath': '$.specName', 'defaultId': '4', 'displayed': '1', 'required': '0'}, {'fieldName': 'truckType', 'jsonPath': '$.truckType', 'defaultId': '2', 'displayed': '1', 'required': '1', 'availableValueList': ['10', '20']}, {'fieldName': 'imageCertList', 'jsonPath': '$.imageCertList[*]certType', 'defaultId': '11', 'displayed': '1', 'required': '0', 'availableValueList': ['2', '3']}, {'fieldName': 'arrivalDatetime', 'jsonPath': '$.arrivalDatetime', 'defaultId': '9', 'displayed': '1', 'required': '0'}, {'fieldName': 'remark', 'jsonPath': '$.remark', 'defaultId': '8', 'displayed': '1', 'required': '0'}, {'fieldName': 'remark', 'jsonPath': '$.remark', 'defaultId': '6', 'displayed': '1', 'required': '0'}, {'fieldName': 'measureType', 'jsonPath': '$.measureType', 'defaultId': '12', 'displayed': '1', 'required': '1', 'availableValueList': ['10', '20']}]}
 {'headers': {'Host': 'test.trace.diligrp.com:8393', 'Connection': 'keep-alive', 'Content-Length': '1378', 'Accept': 'application/json,text/javascript,*/*;q=0.01', 'X-Requested-With': 'XMLHttpRequest', 'User-Agent': 'Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/91.0.4472.77Safari/537.36', 'Content-Type': 'application/json', 'Origin': 'http://test.trace.diligrp.com:8393', 'Referer': 'http://test.trace.diligrp.com:8393/fieldConfig/bill.html', 'Accept-Encoding': 'gzip,deflate', 'Accept-Language': 'zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7'}}
-[2021-07-20 14:27:04] [INFO] : ======================================================================================
-[2021-07-20 14:27:04] [INFO] : http://test.trace.diligrp.com:8393/newRegisterBill/doAdd.action
+[2021-07-20 14:36:12] [INFO] : ======================================================================================
+[2021-07-20 14:36:12] [INFO] : http://test.trace.diligrp.com:8393/newRegisterBill/doAdd.action
 {"registerHeadWeight": "0", "registerHeadRemainWeight": "0", "imageCertList": [], "measureType": 20, "registType": 10, "userId": 516, "arrivalTallynos": [], "arrivalDatetime": "", "truckType": 10, "weight": "111", "weightUnit": 1, "productName": "\u5927\u767d\u83dc", "productId": 2190, "originName": "", "originId": "", "unitPrice": "", "truckTareWeight": "", "remark": "", "specName": "", "brandName": "", "plate": "\u5dddA123456"}
 {}
@@ -3,7 +3,7 @@
 import unittest
 import urllib3
 from commons import common as com
-from commons.MySession import my
+from commons.MySession import my,s1,s2
 from commons.api.fieldConfig import fieldConfig
 from commons.api.doAdd import doAdd
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -29,4 +29,15 @@ class test_doAdd(unittest.TestCase):
         print(re.json())
         #响应断言
         self.assertEqual(re.status_code, 200)
-        self.assertTrue("'code':'200'" in str(re.json()).replace(" ",""))
 \ No newline at end of file
+        self.assertTrue("'code':'200'" in str(re.json()).replace(" ",""))
+        re = s1.post(url=do.url,headers=do.header,data=json.dumps(do.body))
+        print(re.json())
+        #响应断言
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'code':'200'" in str(re.json()).replace(" ",""))
+        re = s2.post(url=do.url,headers=do.header,data=json.dumps(do.body))
+        print(re.json())
+        #响应断言
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'code':'200'" in str(re.json()).replace(" ",""))
+