1.更新沈阳市场和哈尔滨市场的session名称

2.更新沈阳市场和哈尔滨市场的用例class注释，加入市场名称，以区分用例绑定的市场。

1.更新沈阳市场和哈尔滨市场的session名称
2.更新沈阳市场和哈尔滨市场的用例class注释，加入市场名称，以区分用例绑定的市场。
lixi
1 parent e5edbd8a
Showing 11 changed files with 48 additions and 45 deletions
commons/api/weighingServiceSave.py
testcase/heb/CZFW/test_weightBizBill_doRefund.py
testcase/heb/CZFW/test_weightBizBill_listPage.py
testcase/heb/entranceFeeBill_detail/test_entranceFeeBill_details.py
testcase/heb/entranceFeeBill_proves/test_entranceFeeBill_provesPage.py
testcase/heb/weightBizBill/test_weighingServiceSave.py
testcase/sy/CZFW/test_weightBizBill_doRefund.py
testcase/sy/CZFW/test_weightBizBill_listPage.py
testcase/sy/entranceFeeBill_detail/test_entranceFeeBill_details.py
testcase/sy/entranceFeeBill_proves/test_entranceFeeBill_provesPage.py
testcase/sy/weightBizBill/test_weighingServiceSave.py
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 import urllib3
 from commons import common as com
-from commons.MySession import my,sy1
+from commons.MySession import my,sy1,heb
 from commons.basic.duplicateToken import duplicateToken
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -57,6 +57,9 @@ class weighingServiceSave():
-# tt=weighingServiceSave(sy1)
-# re=sy1.post(url=tt.url,headers=tt.header,json=tt.body)
-# print(re.json())
 \ No newline at end of file
+# tt=weighingServiceSave(heb)
+# tt.refresh_commit_token()
+# re=heb.post(url=tt.url,headers=tt.header,json=tt.body)
+# print(re.json())
+# print(heb.user.sort())
+# print(sy1.user.sort())
 \ No newline at end of file
@@ -4,18 +4,18 @@ import unittest
 import urllib3
 from commons import common as com
 from commons import ConfigDB as db
-from commons.MySession import my,sy1
+from commons.MySession import my,heb
 from commons.api.weightBizBill_doRefund import weightBizBill_doRefund
 from commons.api.weighingServiceSave import weighingServiceSave
 from commons.basic.listCarType import listCarType
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 do=weightBizBill_doRefund()
-ad=weighingServiceSave(sy1)
-ca=listCarType(sy1)
+ad=weighingServiceSave(heb)
+ca=listCarType(heb)
 class test_weightBizBill_doRefund(unittest.TestCase):
-    "称重服务-称重服务单列表"
+    "哈尔滨市场-称重服务-称重服务单列表"
     def setUp(self):
@@ -28,13 +28,13 @@ class test_weightBizBill_doRefund(unittest.TestCase):
         body["carTypeId"]=car[0]["id"]
         body["carTypeName"]=car[0]["carTypeName"]
         body["carTypeCode"]=car[0]["code"]
-        self.re=sy1.post(url=ad.url,headers=ad.header,json=body)
+        self.re=heb.post(url=ad.url,headers=ad.header,json=body)
     @unittest.case_mark(my.mark())  
     def test_weightBizBill_doRefund_01(self):
         "称重服务单列表-退款：成功退款一个现金交费的称重单"
         body=do.body.replace("206",str(self.re.json()["data"]["id"]))
-        re=sy1.post(url=do.url,headers=do.header,data=body.encode('utf-8'))
+        re=heb.post(url=do.url,headers=do.header,data=body.encode('utf-8'))
         print(re.json())
         #获取退款后称重单的状态，3为已退款
         bill_status=db.mysql_selectOne(
@@ -4,18 +4,18 @@ import unittest
 import urllib3
 import time
 from commons import common as com
-from commons.MySession import my,sy1
+from commons.MySession import my,heb
 from commons.api.weightBizBill_listPage import weightBizBill_listPage
 from commons.api.weighingServiceSave import weighingServiceSave
 from commons.basic.listCarType import listCarType
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 bi=weightBizBill_listPage()
-ad=weighingServiceSave(sy1)
-ca=listCarType(sy1)
+ad=weighingServiceSave(heb)
+ca=listCarType(heb)
 class test_weightBizBill_listPage(unittest.TestCase):
-    "称重服务-称重服务单列表"
+    "哈尔滨市场-称重服务-称重服务单列表"
     def setUp(self):
         "数据准备：新增一条称重单"
@@ -29,7 +29,7 @@ class test_weightBizBill_listPage(unittest.TestCase):
         body["carTypeId"]=car[0]["id"]
         body["carTypeName"]=car[0]["carTypeName"]
         body["carTypeCode"]=car[0]["code"]
-        self.re=sy1.post(url=ad.url,headers=ad.header,json=body)
+        self.re=heb.post(url=ad.url,headers=ad.header,json=body)
     @unittest.case_mark(my.mark())  
@@ -37,8 +37,8 @@ class test_weightBizBill_listPage(unittest.TestCase):
         "称重服务单列表-查询：查询条件为“单据编号”，其余查询条件输入合法值，查询一条指定数据"
         body=bi.body.replace("202108030900001",self.re.json()["data"]["number"]).replace(
             "carTypeId=53","carTypeId={}".format(ca.car_list()["data"][0]["id"])).replace(
-            "depId=139","depId={}".format(sy1.user["sy_user01"]["departmentId"]))
-        re=sy1.post(url=bi.url,headers=bi.header,data=body)
+            "depId=139","depId={}".format(heb.user["sy_user01"]["departmentId"]))
+        re=heb.post(url=bi.url,headers=bi.header,data=body)
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'total':1" in str(re.json()).replace(" ",""))
@@ -51,8 +51,8 @@ class test_weightBizBill_listPage(unittest.TestCase):
             "202108030900001","{}".format(ad.body["plate"])).replace(
             "2020-08-03 00:00:00","{}".format(self.time)).replace(
             "carTypeId=53", "carTypeId={}".format(ca.car_list()["data"][0]["id"])).replace(
-            "depId=139", "depId={}".format(sy1.user["sy_user01"]["departmentId"]))
-        re=sy1.post(url=bi.url,headers=bi.header,data=body.encode('utf-8'))
+            "depId=139", "depId={}".format(heb.user["sy_user01"]["departmentId"]))
+        re=heb.post(url=bi.url,headers=bi.header,data=body.encode('utf-8'))
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue(ad.body["plate"] in str(re.json()).replace(" ",""))
@@ -4,14 +4,14 @@ import unittest
 import urllib3
 from commons import ConfigDB as db
 from commons import common as com
-from commons.MySession import my,sy1
+from commons.MySession import my,heb
 from commons.api.entranceFeeBill_details import entranceFeeBill_details
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 en=entranceFeeBill_details()
 class test_entranceFeeBill_details(unittest.TestCase):
-    "进门收费管理-收费单标记"
+    "哈尔滨市场-进门收费管理-收费单标记"
     @classmethod
     def setUpClass(cls):
@@ -30,7 +30,7 @@ class test_entranceFeeBill_details(unittest.TestCase):
             replace("type=1", "type={}".format(self.data[5])).\
             replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
             replace("companyId=9", "companyId={}".format(self.data[8]))
-        re=sy1.get(url=url,headers=en.header)
+        re=heb.get(url=url,headers=en.header)
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'total':1" in str(re.json()).replace(" ",""))
@@ -49,7 +49,7 @@ class test_entranceFeeBill_details(unittest.TestCase):
             replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
             replace("companyId=9", "companyId={}".format(self.data[8])).\
             replace("attr=number", "attr=likePlate")
-        re=sy1.get(url=url,headers=en.header)
+        re=heb.get(url=url,headers=en.header)
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
@@ -67,7 +67,7 @@ class test_entranceFeeBill_details(unittest.TestCase):
             replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
             replace("companyId=9", "companyId={}".format(self.data[8])).\
             replace("attr=number", "attr=goods")
-        re=sy1.get(url=url,headers=en.header)
+        re=heb.get(url=url,headers=en.header)
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
@@ -85,7 +85,7 @@ class test_entranceFeeBill_details(unittest.TestCase):
             replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
             replace("companyId=9", "companyId={}".format(self.data[8])).\
             replace("attr=number", "attr=pay")
-        re=sy1.get(url=url,headers=en.header)
+        re=heb.get(url=url,headers=en.header)
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
@@ -103,7 +103,7 @@ class test_entranceFeeBill_details(unittest.TestCase):
             replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
             replace("companyId=9", "companyId={}".format(self.data[8])).\
             replace("attr=number", "attr=cname")
-        re=sy1.get(url=url,headers=en.header)
+        re=heb.get(url=url,headers=en.header)
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
@@ -121,7 +121,7 @@ class test_entranceFeeBill_details(unittest.TestCase):
             replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
             replace("companyId=9", "companyId={}".format(self.data[8])).\
             replace("attr=number", "attr=ic")
-        re=sy1.get(url=url,headers=en.header)
+        re=heb.get(url=url,headers=en.header)
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
@@ -139,7 +139,7 @@ class test_entranceFeeBill_details(unittest.TestCase):
             replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
             replace("companyId=9", "companyId={}".format(self.data[8])).\
             replace("attr=number", "attr=phone")
-        re=sy1.get(url=url,headers=en.header)
+        re=heb.get(url=url,headers=en.header)
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
@@ -4,14 +4,14 @@ import unittest
 import urllib3
 from commons import ConfigDB as db
 from commons import common as com
-from commons.MySession import my,sy1
+from commons.MySession import my,heb
 from commons.api.entranceFeeBill_provesPage import entranceFeeBill_provesPage
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 en=entranceFeeBill_provesPage()
 class test_entranceFeeBill_provesPage(unittest.TestCase):
-    "进门收费管理-证明类型明细"
+    "哈尔滨市场-进门收费管理-证明类型明细"
     @classmethod
     def setUpClass(cls):
@@ -27,7 +27,7 @@ class test_entranceFeeBill_provesPage(unittest.TestCase):
                 replace("雪莲果", self.data[11]).replace("14158", str(self.data[10])).
                 replace("103", str(self.data[0]))).replace("1621",str(self.data[8]))).replace(
             "companyId=9","companyId={}".format(str(self.data[6])))
-        re=sy1.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
+        re=heb.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'total':1" in str(re.json()).replace(" ",""))
@@ -44,7 +44,7 @@ class test_entranceFeeBill_provesPage(unittest.TestCase):
                 replace("103", str(self.data[0]))).
                 replace("1621",str(self.data[8]))).\
                 replace("companyId=9","companyId={}".format(str(self.data[6])))
-        re=sy1.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
+        re=heb.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[1]) in str(re.json()).replace(" ",""))
@@ -60,7 +60,7 @@ class test_entranceFeeBill_provesPage(unittest.TestCase):
                 replace("103", str(self.data[0]))).
                 replace("1621",str(self.data[8]))).\
                 replace("companyId=9","companyId={}".format(str(self.data[6])))
-        re=sy1.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
+        re=heb.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[1]) in str(re.json()).replace(" ",""))
@@ -76,7 +76,7 @@ class test_entranceFeeBill_provesPage(unittest.TestCase):
                 replace("103", str(self.data[0]))).
                 replace("1621",str(self.data[8]))).\
                 replace("companyId=9","companyId={}".format(str(self.data[6])))
-        re=sy1.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
+        re=heb.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[1]) in str(re.json()).replace(" ",""))
@@ -92,7 +92,7 @@ class test_entranceFeeBill_provesPage(unittest.TestCase):
                  replace("103", str(self.data[0]))).
                 replace("1621", str(self.data[8]))). \
             replace("companyId=9", "companyId={}".format(str(self.data[6])))
-        re = sy1.post(url=en.url, headers=en.header, data=body.encode("utf-8"))
+        re = heb.post(url=en.url, headers=en.header, data=body.encode("utf-8"))
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'number':'{}'".format(self.data[1]) in str(re.json()).replace(" ", ""))
@@ -3,17 +3,17 @@
 import unittest
 import urllib3
 from commons import common as com
-from commons.MySession import my,sy1
+from commons.MySession import my,heb
 from commons.api.weighingServiceSave import weighingServiceSave
 from commons.basic.listCarType import listCarType
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-we=weighingServiceSave(sy1)
-li=listCarType(sy1)
+we=weighingServiceSave(heb)
+li=listCarType(heb)
 class test_weighingServiceSave(unittest.TestCase):
-    "称重服务"
+    "哈尔滨市场-称重服务"
     @classmethod
     def setUpClass(cls):
@@ -30,7 +30,7 @@ class test_weighingServiceSave(unittest.TestCase):
         body["carTypeId"]=car[0]["id"]
         body["carTypeName"]=car[0]["carTypeName"]
         body["carTypeCode"]=car[0]["code"]
-        re=sy1.post(url=we.url,headers=we.header,json=body)
+        re=heb.post(url=we.url,headers=we.header,json=body)
         print(re.json())
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'message':'交费成功','result':'交费成功','success':True" in str(re.json()).replace(" ",""))
@@ -15,7 +15,7 @@ ca=listCarType(sy1)
 class test_weightBizBill_doRefund(unittest.TestCase):
-    "称重服务-称重服务单列表"
+    "沈阳市场-称重服务-称重服务单列表"
     def setUp(self):
@@ -15,7 +15,7 @@ ca=listCarType(sy1)
 class test_weightBizBill_listPage(unittest.TestCase):
-    "称重服务-称重服务单列表"
+    "沈阳市场-称重服务-称重服务单列表"
     def setUp(self):
         "数据准备：新增一条称重单"
@@ -11,7 +11,7 @@ en=entranceFeeBill_details()
 class test_entranceFeeBill_details(unittest.TestCase):
-    "进门收费管理-收费单标记"
+    "沈阳市场-进门收费管理-收费单标记"
     @classmethod
     def setUpClass(cls):
@@ -11,7 +11,7 @@ en=entranceFeeBill_provesPage()
 class test_entranceFeeBill_provesPage(unittest.TestCase):
-    "进门收费管理-证明类型明细"
+    "沈阳市场-进门收费管理-证明类型明细"
     @classmethod
     def setUpClass(cls):
@@ -13,7 +13,7 @@ li=listCarType(sy1)
 class test_weighingServiceSave(unittest.TestCase):
-    "称重服务"
+    "沈阳市场-称重服务"
     @classmethod
     def setUpClass(cls):