Merge remote-tracking branch 'origin/master'

lixi
2 parents 9fa20e3d c0ed441d
Showing 4 changed files with 4 additions and 6 deletions
testcase/FeedbackCustomerController/test_fc_view.py
testcase/FeedbackCustomerController/test_feedback_customer_query.py
testcase/FeedbackOrderController/test_feedback_order_settlement_query.py
testcase/feedbackOrderController_settlementlist/test_feedbackOrderController_settlementlist.py
@@ -25,7 +25,7 @@ class test_fc_view(unittest.TestCase):
         print("查询出返还人id", self.code)
     # @unittest.case_mark(my.mark())
-    def test_doAudit_01(self):
+    def test_fc_view_01(self):
         "查看返还人"
         # 请求url中的需要替换为新增返还人的id
         url = vi.url.replace("40", str(self.code))
@@ -37,7 +37,6 @@ class test_fc_view(unittest.TestCase):
         # 断言响应数据中是否存在期望字符串
         self.assertTrue('关联交费卡号' in str(re.text))
-        return re
     @classmethod
     def tearDownClass(cls):
@@ -16,7 +16,7 @@ class test_feedback_customer_query(unittest.TestCase):
         body = fcq.body.replace("史芳", "孟莹").replace("2021-07-02 00:00:00","\
         2021-08-02 00:00:00").replace("2021-08-03 23:59:59", "2021-08-08 23:59:59")
-        re = sy1.post(url = fcq.url, data = body.encode('utf-8'),headers = fcq.header,proxies=my.myproxies)
+        re = sy1.post(url = fcq.url, data = body.encode('utf-8'),headers = fcq.header)
         print(re.headers)
         print(re.json())
         self.assertTrue("孟莹" in str(re.json()))
@@ -16,11 +16,10 @@ class test_feedback_order_settlement_query(unittest.TestCase):
         body = fosq.body.replace("feedbackCustomerId=25", "feedbackCustomerId=16").replace("2021-07-22 00:00:00", "\
                 2021-07-03 00:00:00").replace("2021-08-03 23:59:59", "2021-08-03 23:59:59")
-        re = sy1.post(url = fosq.url, data = body,headers = fosq.header,proxies=my.myproxies)
+        re = sy1.post(url = fosq.url, data = body,headers = fosq.header)
         print(re.headers)
         print(re.json())
         self.assertTrue("新爱心园婚介所的总公司" in str(re.json()))
-        return re
     @classmethod
     def tearDownClass(cls):
@@ -19,7 +19,7 @@ class test_feedbackOrderController_settlementlist(unittest.TestCase):
             .replace("2021-08-05 23:59:59", "2021-08-06 23:59:59")\
             .replace("feedbackCustomerId=25", "feedbackCustomerId=26")
-        re = sy1.post(url=focsl.url, data=body, headers=focsl.header,proxies=my.myproxies)
+        re = sy1.post(url=focsl.url, data=body, headers=focsl.header)
         print(re.json())
     @classmethod