修改了test_Upstream的演示代码

175930106 · liujiqiang
1 parent 535c3ce5
Showing 10 changed files with 18 additions and 353 deletions
src/commons/MySession.py
src/commons/__pycache__/MySession.cpython-36.pyc
src/commons/api/__pycache__/doAdd.cpython-36.pyc
src/commons/api/doAdd.py
src/commons/api/upStream.py
src/config/api/login.conf
src/config/global_data.conf
src/report/test.log
src/testcase/fieldConfig/__pycache__/test_fieldConfig.cpython-36.pyc
src/testcase/upStream/__pycache__/test_upStream.cpython-36.pyc
@@ -31,7 +31,7 @@ class mysession():
         self.url=mysession.url.replace("http://test.",com.get_global_config("global_data", "environment", "en") )
         self.header=mysession.header
         self.body=mysession.body
-        self.timeout = (3,5)
+        self.timeout = (5,3)
         self.max_retries = 3
         self.keep_alive = False
         self.ssl_verify=False
@@ -181,4 +181,4 @@ class mysession():
 my=mysession()
 my.set_mark()
 s1=my.get_session("user01")
-s2=my.get_session("user02")
+# s2=my.get_session("user02")
@@ -4,7 +4,7 @@ import requests
 import json
 import urllib3
 from commons import common as com
-from commons.MySession import my,s1,s2
+from commons.MySession import my,s1
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
  
  
@@ -32,6 +32,11 @@ class upStream():
  
  
  
-# tt=upStream()
-# re=my.post(url=tt.url,headers=tt.header,json=tt.body)
+# uu=upStream()
+# re=my.post(url=uu.url,headers=uu.header,json=uu.body)
+# print(re.json())
+#=========================================================
+# body=uu.body.copy()
+# body["likeName"]="111"
+# re=my.post(url=uu.url,headers=uu.header,json=body)
 # print(re.json())
 \ No newline at end of file
-# -*- coding: UTF-8 -*-
-
-[login01]
-method=post
-url=http://test.uap.diligrp.com/login/login.action
-
-header={
-    "Host": "test.uap.diligrp.com",
-    "Connection": "keep-alive",
-    "Content-Length": "33",
-    "Cache-Control": "max-age=0",
-    "Upgrade-Insecure-Requests": "1",
-    "Origin": "http://test.uap.diligrp.com",
-    "Content-Type": "application/x-www-form-urlencoded",
-    "User-Agent": "Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/90.0.4430.212Safari/537.36",
-    "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
-    "Referer": "http://test.uap.diligrp.com/login/index.html",
-    "Accept-Encoding": "gzip,deflate",
-    "Accept-Language": "zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7",
-    "Cookie": "UAP_accessToken=;UAP_refreshToken=;UAP_loginPath="}
-
-body=userName=sg_wenze&password=111111
-
-
-
-
-
-	
-	
-[basic_data_prepare]
-#商品
-instert_product=INSERT INTO product.product VALUES ('301', '16', '猕猴桃', 'PD2019021000000001', '猕猴桃', 'dili-fresh/groupbuy/7f9fc034c2ec41e18b7560fc42a25abd', '2019-01-29 08:00:00', '2020-12-12 00:00:00', '2019-02-02 10:00:00', '2019-12-11 20:00:00', '600', '<p>预售商品，次日取货。</p><p>预计到店时间：2月3日14点之后。</p><p>到货后群内通知。</p><p><img style=\"max-width:100%;\" src=\"http://img10.nong12.com/dili-fresh/groupbuy/c4aa09d06af948f09269cd0d367fa623\"><br></p><p><br></p>', '2019-01-29 15:48:19', '1', '2019-02-02 10:13:33', '39', '4', '0', '400', '0');
-#商品
-instert_product_tag=INSERT INTO product.product_tag VALUES ('500', '1', '300', null, null, '2019-02-10 10:13:34', '2019-02-10 10:13:33');
-instert_tag=INSERT INTO `tag` VALUES ('1', '年货爆款', '26', '2019-01-14 11:24:48', '26', '2019-03-05 14:13:46', '27');
-instert_product_stock1=INSERT INTO product.area_stock VALUES ('500', '300', '600', '1000', '0', '1000', '1', '510100', '2019-02-02 10:13:33', '999', null, '2019-01-29 15:48:19', null, '6', '0', '3.00', '1000');
-instert_product_stock2=INSERT INTO product.area_stock VALUES ('501', '300', '600', '1000', '0', '1000', '1', '210100', '2019-02-02 16:40:49', '999', null, '2019-01-29 15:48:19', null, '78', '0', '3.00', '1000');
-instert_shop=INSERT INTO `shop` VALUES ('116', '成都SAC新店0001', 'S001953', 'W000101', '00010953', '四川省成都市青羊区天府广场', null, '510100', null, '30.663420320381004', '104.07219216758062', null, '李老板', '15111888983', null, null, '天府广场', '3', null, '1', '1', '2019-02-11 14:12:01', null, null, null);
-instert_wallet=INSERT INTO `wallet` VALUES ('11845', '00010953', '0', '0', '0', '1', '0', '2019-02-11 12:08:50', '2019-02-11 12:08:50', null, null);
-
-[data_clean]
-delete_product=DELETE FROM product.product WHERE id = 300;
-delete_product_tag=DELETE FROM product.product_tag WHERE product_tag.product_id = 300;
-delete_product_stock=DELETE FROM product.area_stock WHERE area_stock.product_id = 300;
-
-
-[submitOrder01]
-notes="下单成功：优惠券为空,其他参数传入有效值"
-delete_order=DELETE FROM `customer_coupon` WHERE code = 10000;
-requestBody={
-	"payCredential": "1548316340046",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}]
-	}
-expect_Response={"code":"200","data":{"nonceStr":"APm6DY1wlK7cGkVbOAqe","orderCode":"O2019021400000009","pacKage":"prepay_id=1550137322575","payEnable":2,"paySign":"470D0E4BD0A2F13F8772DF29A6B7B206","signType":"MD5","timeStamp":"1550137323166"},"result":"OK","success":1}
-
-
-[submitOrder02]
-notes="下单失败：商品为空时,优惠券为空,其他参数填入有效值"
-requestBody={
-	"payCredential": "1548316340046",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": []
-	}	
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}	
-
-[submitOrder03]
-notes="下单成功：使用有效优惠券,其他参数填入有效值"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00010966', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2019-01-17 00:00:00', '2025-01-26 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019011700000052",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"200","data":{"nonceStr":"APm6DY1wlK7cGkVbOAqe","orderCode":"O2019021400000009","pacKage":"prepay_id=1550137322575","payEnable":2,"paySign":"470D0E4BD0A2F13F8772DF29A6B7B206","signType":"MD5","timeStamp":"1550137323166"},"result":"OK","success":1}
-
-
-
-[submitOrder04]
-notes="下单失败：支付用已经使用过的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '0', '00010953', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2019-01-17 00:00:00', '2025-01-26 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}
-
-	
-[submitOrder05]
-notes="下单失败：支付用过期的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00010953', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2019-01-17 00:00:00', '2019-01-18 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}	
-	
-[submitOrder06]
-notes="下单失败：支付用别人的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00001008', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2019-01-17 00:00:00', '2025-01-18 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}
-
-
-[submitOrder07]
-notes="下单失败：支付用未到期的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00010953', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2025-01-17 00:00:00', '2025-01-18 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}
-	
-[submitOrder08]
-notes="下单失败：支付用未满减条件的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00010953', '004', '成勇测试01', 'auto', '2', '1', '1000', '1000', '2019-01-17 00:00:00', '2025-01-18 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}	
-
-[submitOrder09]
-notes="下单失败：使用被关闭的自提点"
-shop_shutdown=UPDATE `fresh-uap`.shop SET state = 4 WHERE code = 'S001953' ;
-shop_open=UPDATE `fresh-uap`.shop SET state = 3 WHERE code = 'S001953' ;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}]
-	}
-expect_Response={"code":"5000","result":"自提点异常","success":false}
-
-
-[submitOrder10]
-notes="下单失败：客户被禁用时下单"
-customer_disable=UPDATE customer.customer SET enabled_state = 0 WHERE `code` = 00010966 ;
-customer_enable=UPDATE customer.customer SET enabled_state = 1 WHERE `code` = 00010966 ;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}]
-	}	
-expect_Response={"code":"5000","result":"账户被禁用","success":false}
-
-[submitOrder11]
-notes="下单失败：购买其他地区的商品"
-requestBody={
-	"payCredential": "1548316340046",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "110100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}]
-	}
-expect_Response={"code":"5000","result":"商品沈阳独立商品超过购买限制,限制购买总数为0","success":false}
 \ No newline at end of file
@@ -10,8 +10,9 @@ user01=210
 user02=87
 user03=256
  
-[environment]
-en=http://test.
+[email]
+list=[]
+list1=["lixi@diligrp.com","LI@diligrp.com"]
  
 [mark]
 list=[]
@@ -25,9 +26,10 @@ dbuser=root
 dbpassword=123456
 dbcharset=utf8
  
-[email]
-list=[]
-list1=["lixi@diligrp.com","LI@diligrp.com"]
+[environment]
+en=http://test.
+
+
  
  
  
-[2021-06-28 17:38:14] [INFO] : http://test.trace.diligrp.com:8393/upStream/listPage.action
+[2021-06-30 11:04:51] [INFO] : http://test.trace.diligrp.com:8393/upStream/listPage.action
 None
 {'rows': 10, 'page': 1, 'sort': 'id', 'order': 'desc', 'metadata': {'created': '{"provider":"datetimeProvider","index":10,"field":"created"}', 'upORdown': '{"provider":"userFlagProvider","index":20,"field":"upORdown"}', 'upstreamType': '{"provider":"upStreamTypeProvider","index":30,"field":"upstreamType"}'}}
 {'headers': {'Host': 'test.trace.diligrp.com', 'Connection': 'keep-alive', 'Content-Length': '325', '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/90.0.4430.212Safari/537.36', 'Content-Type': 'application/json', 'Origin': 'http://test.trace.diligrp.com:8393', 'Referer': 'http://test.trace.diligrp.com:8393/upStream/index.html', 'Accept-Encoding': 'gzip,deflate', 'Accept-Language': 'zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7'}}
  
-[2021-06-28 17:38:14] [INFO] : http://test.trace.diligrp.com:8393/upStream/listPage.action
-None
-{'rows': 10, 'page': 1, 'sort': 'id', 'order': 'desc', 'metadata': {'created': '{"provider":"datetimeProvider","index":10,"field":"created"}', 'upORdown': '{"provider":"userFlagProvider","index":20,"field":"upORdown"}', 'upstreamType': '{"provider":"upStreamTypeProvider","index":30,"field":"upstreamType"}'}, 'likeName': '111'}
-{'headers': {'Host': 'test.trace.diligrp.com', 'Connection': 'keep-alive', 'Content-Length': '325', '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/90.0.4430.212Safari/537.36', 'Content-Type': 'application/json', 'Origin': 'http://test.trace.diligrp.com:8393', 'Referer': 'http://test.trace.diligrp.com:8393/upStream/index.html', 'Accept-Encoding': 'gzip,deflate', 'Accept-Language': 'zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7'}}
-