Merge remote-tracking branch 'origin/master'

wenleiming
2 parents 05d80b27 d7ab0697
Showing 7 changed files with 49 additions and 31 deletions
commons/MySession.py
commons/api/weighingServiceSave.py
commons/api/weightBizBill_doRefund.py
commons/api/weightBizBill_listPage.py
commons/basic/duplicateToken.py
commons/common.py
testcase/weightBizBill/test_weighingServiceSave.py
@@ -7,7 +7,7 @@ from commons.clientSession import cliSession
 from commons.scripts.pwdCry import pwdCry
 log=Logger()
  
-class mysession():
+class mysession(requests.Session):
     "封装了requests的基类，以供后期统一使用"
  
     url = "http://test.uap.diligrp.com/login/login.action"
@@ -38,6 +38,7 @@ class mysession():
  
     def __init__(self):
         "如下代码，可以通过配置文件来控制测试环境和灰度环境，http和https"
+        super().__init__()
         self.url = mysession.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header = mysession.header
         self.body = mysession.body
@@ -48,8 +49,8 @@ class mysession():
         self.max_retries = 3
         self.keep_alive = False
         self.ssl_verify = False
-        self.proxies = None
-        # self.proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'}
+        # self.proxies = None
+        self.proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'}
         self.myproxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'}
         self.allow_redirects = False
         self.firmid={"group":"1","hd":"2","cd":"3","qqhe":"4","mdj":"5","gy":"6","cc":"7","sg":"8","sy":"9"}
@@ -103,9 +104,8 @@ class mysession():
         self.body_client.update( {"password": pwdCry(com.get_global_config("global_data", "account", account).split("&")[1])})
         # requests.session()会话保持,比如使用session成功的登录了某个网站，
         # 则在再次使用该session对象求求该网站的其他网页都会默认使用该session之前使用的cookie等参数
-        self.se = requests.session()
         # 使用session对象的方法POST/GET等
-        self.re = self.se.post(url=self.url_client, headers=self.header_client, json=self.body_client, proxies=self.proxies, **kwargs)
+        self.re = super().post(url=self.url_client, headers=self.header_client, json=self.body_client, **kwargs)
         #获取user信息供其他接口使用
         self.user[account]=self.re.json()["data"]["user"]
         #组装请求的cookie
@@ -113,14 +113,13 @@ class mysession():
         co.set("UAP_firmId", str(self.re.json()["data"]["user"]["firmId"]),domain=".diligrp.com")
         co.set("UAP_accessToken", self.re.json()["data"]["accessToken"],domain=".diligrp.com")
         co.set("UAP_refreshToken", self.re.json()["data"]["refreshToken"],domain=".diligrp.com")
-        self.se.cookies.update(co)
+        self.cookies.update(co)
         # 返回session对象，供其他接口使用
-        return self.se
-
+        return self
  
     def close_session(self):
         "关闭session"
-        self.se.close()
+        self.close()
  
     def check_login(self, account, **kwargs):
         "验证登录接口"
@@ -168,7 +167,7 @@ class mysession():
         log.info("{0:=^86}".format(''))
         log.info("{}\n{}\n".format(url, kwargs))
         # 进行请求
-        re = self.se.request(method , url, **kwargs, proxies=self.proxies, timeout=self.timeout)
+        re = super().request(method , url, **kwargs, proxies=self.proxies,timeout=self.timeout)
         return re
  
  
@@ -183,7 +182,7 @@ class mysession():
         log.info("{0:=^86}".format(''))
         log.info("{}\n{}\n".format(url, kwargs))
         # 进行请求
-        re = self.se.get(url, **kwargs, proxies=self.proxies, timeout=self.timeout)
+        re = super().get(url, **kwargs)
         return re
  
     def post(self, url, data=None, json=None, **kwargs):
@@ -199,7 +198,7 @@ class mysession():
         log.info("{0:=^86}".format(''))
         log.info("{}\n{}\n{}\n{}".format(url, data, json, kwargs))
         # 进行请求
-        re = self.se.post(url, data=data, json=json, proxies=self.proxies, **kwargs, timeout=self.timeout)
+        re = super().post(url, data=data, json=json, **kwargs)
         return re
  
     def options(self, url, **kwargs):
@@ -284,9 +283,8 @@ class mysession():
 my = mysession()
 my.set_mark()
 my.cliLogin()
-sy1 = my.get_session_client("sy_user01")
-sy2 = my.get_session_client("sy_user02")
-# heb1 = my.get_session_client("heb_user01")
-# gy1=my.get_session_client("gy_user01")
-# sg1=my.get_session_client("sg_user01")
-# hs1=my.get_session_client("hs_user01")
+sy1=mysession().get_session_client("sy_user01")
+sy2=mysession().get_session_client("sy_user02")
+# sg=mysession().get_session_client("sg_user01")
+
+
@@ -58,5 +58,5 @@ class weighingServiceSave():
  
  
 # tt=weighingServiceSave(sy1)
-# re=sy1.post(url=tt.url,headers=tt.header,json=tt.body,proxies=my.myproxies)
+# re=sy1.post(url=tt.url,headers=tt.header,json=tt.body)
 # print(re.json())
 \ No newline at end of file
@@ -3,7 +3,6 @@
 import urllib3
 from commons import common as com
 from commons.MySession import my,sy1
-from commons.basic.duplicateToken import duplicateToken
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
  
  
@@ -26,6 +25,6 @@ class weightBizBill_doRefund():
  
  
  
-# tt=weightBizBill_listPage()
-# re=sy1.post(url=tt.url,headers=tt.header,json=tt.body,proxies=my.myproxies)
+# tt=weightBizBill_doRefund()
+# re=sy1.post(url=tt.url,headers=tt.header,json=tt.body)
 # print(re.json())
 \ No newline at end of file
@@ -3,7 +3,6 @@
 import urllib3
 from commons import common as com
 from commons.MySession import my,sy1
-from commons.basic.duplicateToken import duplicateToken
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
  
  
@@ -34,5 +33,5 @@ class weightBizBill_listPage():
  
  
 # tt=weightBizBill_listPage()
-# re=sy1.post(url=tt.url,headers=tt.header,json=tt.body,proxies=my.myproxies)
+# re=sy1.post(url=tt.url,headers=tt.header,data=tt.body)
 # print(re.json())
 \ No newline at end of file
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 import urllib3
 from commons import common as com
-from commons.MySession import my,sy1,sy2
+from commons.MySession import my,sy1
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
  
  
@@ -31,5 +31,3 @@ class duplicateToken():
  
  
 # print(duplicateToken(sy1).jmsf_duplicate_commit_token())
-# du=duplicateToken(sy1)
-# print(du.jmsf_duplicate_commit_token())
@@ -83,11 +83,15 @@ def run_one(name):
     runner = unittest.TextTestRunner()
     runner.run(test_suite)
  
+
 def run_list(name):
     test_suite = unittest.TestSuite()
     test_suite.addTests(name)
     #显示运行用例
     print("运行用例为{}".format(test_suite))
+    # with open(file="E:\\PycharmWorkspace\\jmsf-re-local\\report\\test.log", mode="a", encoding="utf-8") as file:
+    #     runner = unittest.TextTestRunner(stream=file,verbosity=2)
+    #     runner.run(test_suite)
     runner = unittest.TextTestRunner()
     runner.run(test_suite)
  
@@ -112,4 +116,10 @@ def run_Name(name):
     runner = unittest.TextTestRunner()
     runner.run(test_cases)
  
-# print(get_market_config("test_config_hg2","loginInfo","userName"))
 \ No newline at end of file
+def mylog(func):
+    def RebackTest(self):
+        print(func.__name__)
+        print(dir(func))
+        # print(self)
+        return func(self)
+    return  RebackTest
 \ No newline at end of file
@@ -2,6 +2,7 @@
 # -*- coding: UTF-8 -*-
 import unittest
 import urllib3
+from commons import common as com
 from commons.MySession import my,sy1
 from commons.api.weighingServiceSave import weighingServiceSave
 from commons.basic.listCarType import listCarType
@@ -10,10 +11,18 @@ we=weighingServiceSave(sy1)
 li=listCarType(sy1)
  
  
-
+@com.mylog
 class test_weighingServiceSave(unittest.TestCase):
     "称重服务"
  
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+
+    def setUp(self) :
+        pass
+
     @unittest.case_mark(my.mark())
     def test_weighingServiceSave_01(self):
         "称重服务：成功新增一条称重服务单"
@@ -26,9 +35,14 @@ class test_weighingServiceSave(unittest.TestCase):
         self.assertEqual(re.status_code, 200)
         self.assertTrue("'message':'交费成功','result':'交费成功','success':True" in str(re.json()).replace(" ",""))
  
+    @com.mylog
+    @unittest.case_mark(my.mark())
+    def test_weighingServiceSave_02(self):
+        "称重服务：成功新增一条称重服务单"
+        print("11111111111111111111111111111111111")
  
 if __name__ == "__main__":
  
-    unittest.main(verbosity=2)
+    # unittest.main(verbosity=2)
  
-    # com.run_one(test_weighingServiceSave("test_weighingServiceSave_01"))
+    com.run_list([test_weighingServiceSave("test_weighingServiceSave_01"),test_weighingServiceSave("test_weighingServiceSave_02")])