From caeb8481f2c7649b9c69bab0e0cd3a117d9db5ab Mon Sep 17 00:00:00 2001 From: ieemoo Date: Thu, 21 Nov 2024 18:04:26 +0800 Subject: [PATCH] Arthur-Wu committed this file on 2024-11-21 --- YiMao/ZeroLib/test_CAnon015_.py | 18 +++++++++++------- ..._CAnon001_AddShoppingBagAndSettlePayment.py | 6 +++--- ...n002_AddNonDiscountedProductsForPurchase.py | 4 ++-- ...st_CAnon003_AddMemberProductsForPurchase.py | 4 ++-- ...est_CAnon004_AddMultipleItemsForPurchase.py | 6 +++--- ...Anon005_AddDiscountedProductsForPurchase.py | 4 ++-- ...CAnon006_AddPromotionalWhitelistProducts.py | 6 +++--- .../test_CAnon007_AddWeightToTheProduct.py | 6 +++--- .../test_CAnon008_ReturnShoppingBag.py | 6 +++--- ...t_CAnon009_ReturnPurchaseOfOrdinaryGoods.py | 6 +++--- .../test_CAnon010_ReturnOfMemberProducts.py | 6 +++--- ...on011_ReturnOneItemFromMultiplePurchases.py | 6 +++--- ...test_CAnon012_ReturnOfDiscountedProducts.py | 4 ++-- ...Anon013_ReturnPromotionWhitelistProducts.py | 6 +++--- .../test_CAnon014_ReturnWeightOfTheProducte.py | 6 +++--- .../BusiScenarios/test_CNoLogin001_CheckADs.py | 2 +- ...t_CVip001_AddShoppingBagAndSettlePayment.py | 2 +- ...p002_AddNonDiscountedProductsForPurchase.py | 2 +- ...est_CVip003_AddMemberProductsForPurchase.py | 2 +- ...test_CVip004_AddMultipleItemsForPurchase.py | 2 +- ...CVip005_AddDiscountedProductsForPurchase.py | 2 +- ..._CVip006_AddPromotionalWhitelistProducts.py | 2 +- .../test_CVip007_AddWeightToTheProduct.py | 2 +- .../test_CVip008_ReturnShoppingBag.py | 2 +- ...st_CVip009_ReturnPurchaseOfOrdinaryGoods.py | 2 +- .../test_CVip010_ReturnOfMemberProducts.py | 2 +- ...ip011_ReturnOneItemFromMultiplePurchases.py | 2 +- .../test_CVip012_ReturnOfDiscountedProducts.py | 2 +- ...CVip013_ReturnPromotionWhitelistProducts.py | 2 +- .../test_CVip014_ReturnWeightOfTheProducte.py | 2 +- 30 files changed, 64 insertions(+), 60 deletions(-) diff --git a/YiMao/ZeroLib/test_CAnon015_.py b/YiMao/ZeroLib/test_CAnon015_.py index c2f6cd3..e652732 100644 --- a/YiMao/ZeroLib/test_CAnon015_.py +++ b/YiMao/ZeroLib/test_CAnon015_.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 匿名加购计件商品，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -11,21 +11,25 @@ from YiMao.data.WuShangSceneTestData import * DescName = "Anon015-匿名加购计件商品，并结算" @allure.story(f'[场景测试] {DescName}验证') -class Test_CAnon003(unittest.TestCase): +class Test_CAnon015(unittest.TestCase): f'''@Date:: 2024/11/15 @Author:: Arthur Wu @Desc:: [购物车客户端] {DescName} - 1、武商测试环境，计件商品inputcode为： - + 1、步骤 + 1）加购计件或计重商品，返回为待核验商品 + 2）点击结算，校验返回结果“不可结算” + 3）调用管理平台“待核验商品-审核通过”接口 + 4）点击结算，校验返回结果“可结算” ''' def setUp(self) -> None: self.timestamp = int(time.time()) self.ymc = YMClientApi(ShoppingCartMac) # 会员有优惠商品暂未提供 - self.vip_goods_inputcode = VipGoodsInputcode # 统一番茄牛肉面 + # self.vip_goods_inputcode = VipGoodsInputcode # 统一番茄牛肉面 + self.vip_goods_inputcode = "124312354" # 统一番茄牛肉面 - def test_CAnon003_AddMemberProductsForPurchase(self): + def test_CAnon015(self): allure.dynamic.description(f"描述：{DescName}") allure.step("步骤1：session开始") self.ymc.session_start() @@ -43,7 +47,7 @@ class Test_CAnon003(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.vip_goods_inputcode} 不存在") - raise AssertionError(f"商品 {self.vip_goods_inputcode} 不存在") + pytest.fail(f"---商品 {self.vip_goods_inputcode} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon001_AddShoppingBagAndSettlePayment.py b/YiMao/scripts/BusiScenarios/test_CAnon001_AddShoppingBagAndSettlePayment.py index 980c0c8..3372641 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon001_AddShoppingBagAndSettlePayment.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon001_AddShoppingBagAndSettlePayment.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Date:: 2024/11/18-9:38 # @Description:: -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -43,7 +43,7 @@ class Test_CAnon001_AddShoppingBagAndSettlePayment(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---购物袋 {self.goodsbag_mid} 不存在") - raise AssertionError(f"购物袋 {self.goodsbag_mid} 不存在") + pytest.fail(f"购物袋 {self.goodsbag_mid} 不存在") def test_CAnon00102_AddMaxShoppingbagsForPurchase(self): allure.dynamic.description("描述：加购大号购物袋") @@ -63,7 +63,7 @@ class Test_CAnon001_AddShoppingBagAndSettlePayment(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---购物袋 {self.goodsbag_max} 不存在") - raise AssertionError(f"购物袋 {self.goodsbag_mid} 不存在") + pytest.fail(f"购物袋 {self.goodsbag_mid} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon002_AddNonDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon002_AddNonDiscountedProductsForPurchase.py index 3b83d8b..5a7205d 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon002_AddNonDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon002_AddNonDiscountedProductsForPurchase.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Date:: 2024/11/18-10:49 # @Description:: 游客登录，加购无优惠普通商品并结算 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -42,7 +42,7 @@ class Test_CAnon002(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.NormalGoodsInputcode01} 不存在") - raise AssertionError(f"商品 {self.NormalGoodsInputcode01} 不存在") + pytest.fail(f"商品 {self.NormalGoodsInputcode01} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon003_AddMemberProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon003_AddMemberProductsForPurchase.py index a7f2a5c..f494e09 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon003_AddMemberProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon003_AddMemberProductsForPurchase.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购会员商品并结算 # @Date:: 2021-05-10 16:30:23 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -43,7 +43,7 @@ class Test_CAnon003(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.vip_goods_inputcode} 不存在") - raise AssertionError(f"商品 {self.vip_goods_inputcode} 不存在") + pytest.fail(f"商品 {self.vip_goods_inputcode} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon004_AddMultipleItemsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon004_AddMultipleItemsForPurchase.py index b9ec95b..0b64614 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon004_AddMultipleItemsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon004_AddMultipleItemsForPurchase.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购多件商品并结算 # @Date:: 2021-05-10 16:30:23 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -47,10 +47,10 @@ class Test_CAnon004(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.goods_inputcode2} 不存在") - raise AssertionError(f"商品 {self.goods_inputcode2} 不存在") + pytest.fail(f"商品 {self.goods_inputcode2} 不存在") else: LOGGER.info(f"---商品 {self.goods_inputcode1} 不存在") - raise AssertionError(f"商品 {self.goods_inputcode1} 不存在") + pytest.fail(f"商品 {self.goods_inputcode1} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon005_AddDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon005_AddDiscountedProductsForPurchase.py index cbbcb52..e35b0a0 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon005_AddDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon005_AddDiscountedProductsForPurchase.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购打折商品并结算 # @Date:: 2021-05-10 16:30:22 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -43,7 +43,7 @@ class Test_CAnon005(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.sale_goods_inputCode} 不存在") - raise Exception(f"---商品 {self.sale_goods_inputCode} 不存在") + pytest.fail(f"---商品 {self.sale_goods_inputCode} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon006_AddPromotionalWhitelistProducts.py b/YiMao/scripts/BusiScenarios/test_CAnon006_AddPromotionalWhitelistProducts.py index 9381740..b926974 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon006_AddPromotionalWhitelistProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon006_AddPromotionalWhitelistProducts.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购促销白名单商品并结算 # @Date:: 2021-05-10 16:30:23 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi @@ -57,14 +57,14 @@ class Test_CAnon006(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.promotional_whitelist_goods["GoodsInputcode"]} 不存在") - raise Exception(f"商品 {self.promotional_whitelist_goods["GoodsInputcode"]}不存在") + pytest.fail(f"商品 {self.promotional_whitelist_goods["GoodsInputcode"]}不存在") allure.step("[后置处理]：删除添加的促销白名单商品") self.yms.delete_whitelist_goods() else: LOGGER.info(f"---添加商品 {self.promotional_whitelist_goods['GoodsInputcode']} " f"到促销白名单失败") - raise Exception(f"---添加商品 {self.promotional_whitelist_goods['GoodsInputcode']} " + pytest.fail(f"---添加商品 {self.promotional_whitelist_goods['GoodsInputcode']} " f"到促销白名单失败") diff --git a/YiMao/scripts/BusiScenarios/test_CAnon007_AddWeightToTheProduct.py b/YiMao/scripts/BusiScenarios/test_CAnon007_AddWeightToTheProduct.py index f3800c5..30c3b2b 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon007_AddWeightToTheProduct.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon007_AddWeightToTheProduct.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购重量放通商品并结算 # @Date:: 2021-05-10 16:30:22 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi @@ -58,14 +58,14 @@ class Test_CAnon007(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.weight_to_whitelist_goods["GoodsInputcode"]} 不存在") - raise Exception(f"---商品 {self.weight_to_whitelist_goods["GoodsInputcode"]} 不存在") + pytest.fail(f"---商品 {self.weight_to_whitelist_goods["GoodsInputcode"]} 不存在") allure.step("[后置处理]：删除添加的重量放通白名单商品") self.yms.delete_weight_whitelist_goods() else: LOGGER.info(f"---添加商品 {self.weight_to_whitelist_goods['GoodsInputcode']} " f"到重量放通白名单失败") - raise Exception(f"---添加商品 {self.weight_to_whitelist_goods['GoodsInputcode']} " + pytest.fail(f"---添加商品 {self.weight_to_whitelist_goods['GoodsInputcode']} " f"到重量放通白名单失败") diff --git a/YiMao/scripts/BusiScenarios/test_CAnon008_ReturnShoppingBag.py b/YiMao/scripts/BusiScenarios/test_CAnon008_ReturnShoppingBag.py index fa5223e..8d7eada 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon008_ReturnShoppingBag.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon008_ReturnShoppingBag.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购2个购物袋，退购一个购物袋，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -54,10 +54,10 @@ class Test_CAnon008(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.shoppingbag_max} 不存在") - raise AssertionError(f"---商品 {self.shoppingbag_max} 不存在") + pytest.fail(f"---商品 {self.shoppingbag_max} 不存在") else: LOGGER.info(f"---商品 {self.shoppingbag_mid} 不存在") - raise AssertionError(f"---商品 {self.shoppingbag_mid} 不存在") + pytest.fail(f"---商品 {self.shoppingbag_mid} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon009_ReturnPurchaseOfOrdinaryGoods.py b/YiMao/scripts/BusiScenarios/test_CAnon009_ReturnPurchaseOfOrdinaryGoods.py index ee5c5e0..2386470 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon009_ReturnPurchaseOfOrdinaryGoods.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon009_ReturnPurchaseOfOrdinaryGoods.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购2个普通商品，退购一个，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -54,10 +54,10 @@ class Test_CAnon009(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.goods_02} 不存在") - raise AssertionError(f"---商品 {self.goods_02} 不存在") + pytest.fail(f"---商品 {self.goods_02} 不存在") else: LOGGER.info(f"---商品 {self.goods_01} 不存在") - raise AssertionError(f"---商品 {self.goods_01} 不存在") + pytest.fail(f"---商品 {self.goods_01} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py b/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py index beddf05..baa3d7c 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购2个会员商品，退购一个，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -54,10 +54,10 @@ class Test_CAnon010(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.vip_goods_02} 不存在") - raise AssertionError(f"---商品 {self.vip_goods_02} 不存在") + pytest.fail(f"---商品 {self.vip_goods_02} 不存在") else: LOGGER.info(f"---商品 {self.vip_goods_01} 不存在") - raise AssertionError(f"---商品 {self.vip_goods_01} 不存在") + pytest.fail(f"---商品 {self.vip_goods_01} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py b/YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py index 868cb89..d28d109 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购多件商品，退购一个商品，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -54,10 +54,10 @@ class Test_CAnon011(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.goods_inputcode2} 不存在") - raise AssertionError(f"---商品 {self.goods_inputcode2} 不存在") + pytest.fail(f"---商品 {self.goods_inputcode2} 不存在") else: LOGGER.info(f"---商品 {self.goods_inputcode1} 不存在") - raise AssertionError(f"---商品 {self.goods_inputcode1} 不存在") + pytest.fail(f"---商品 {self.goods_inputcode1} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py b/YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py index f38f80f..8edaf6d 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购2个打折商品，退购一个，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * @@ -48,7 +48,7 @@ class Test_CAnon012(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.sale_goods_inputCode} 不存在") - raise AssertionError(f"---商品 {self.sale_goods_inputCode} 不存在") + pytest.fail(f"---商品 {self.sale_goods_inputCode} 不存在") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py b/YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py index e0bd583..92065a1 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购2个促销白名单商品，退购一个，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi @@ -68,14 +68,14 @@ class Test_CAnon013(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.promotional_whitelist_goods["GoodsInputcode"]} 不存在") - raise Exception(f"---商品 {self.promotional_whitelist_goods["GoodsInputcode"]} 不存在") + pytest.fail(f"---商品 {self.promotional_whitelist_goods["GoodsInputcode"]} 不存在") allure.step("[后置处理]：删除添加的促销白名单商品") self.yms.delete_whitelist_goods() else: LOGGER.info(f"---添加商品 {self.promotional_whitelist_goods['GoodsInputcode']} " f"到促销白名单失败") - raise Exception(f"---添加商品 {self.promotional_whitelist_goods['GoodsInputcode']} " + pytest.fail(f"---添加商品 {self.promotional_whitelist_goods['GoodsInputcode']} " f"到促销白名单失败") diff --git a/YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py b/YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py index 16b97a1..e3a5dea 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客登录，加购2个重量放通商品，退购一个，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi @@ -68,14 +68,14 @@ class Test_CAnon014(unittest.TestCase): self.ymc.request_order_settlement(LoginData) else: LOGGER.info(f"---商品 {self.weight_to_whitelist_goods["GoodsInputcode"]} 不存在") - raise Exception(f"---商品 {self.weight_to_whitelist_goods['GoodsInputcode']} 不存在") + pytest.fail(f"---商品 {self.weight_to_whitelist_goods['GoodsInputcode']} 不存在") allure.step("[后置处理]：删除添加的重量放通白名单商品") self.yms.delete_weight_whitelist_goods() else: LOGGER.info(f"---添加商品 {self.weight_to_whitelist_goods['GoodsInputcode']} " f"到重量放通白名单失败") - raise Exception(f"---添加商品 {self.weight_to_whitelist_goods['GoodsInputcode']} " + pytest.fail(f"---添加商品 {self.weight_to_whitelist_goods['GoodsInputcode']} " f"到重量放通白名单失败") diff --git a/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py b/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py index c0686eb..8218dc1 100644 --- a/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py +++ b/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Date:: 2024/11/15-14:43 # @Description:: -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py b/YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py index 83a0552..0ea99d3 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py +++ b/YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购购物袋，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py index 4b9e521..0b274b7 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购普通商品，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py index 2683ecf..7c41470 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购会员商品，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py index db5d8e8..abcb53f 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购多件商品，并结算 # @Date:: 2024/11/20 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py index ebef928..e39d351 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购打折商品，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py b/YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py index db6f0f9..86ff893 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购促销白名单商品，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi diff --git a/YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py b/YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py index b6f802d..9dd1ae5 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py +++ b/YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购重量放通商品，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi diff --git a/YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py b/YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py index 3f58c50..a0f5486 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py +++ b/YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购2个购物袋，退购一个购物袋，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py b/YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py index 579ae40..5396e27 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py +++ b/YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购2个普通商品，退购一个，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py b/YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py index 05b4ccb..b4fafa2 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购2个会员商品，退购一个，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py b/YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py index 1d95a2a..320e489 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py +++ b/YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购多件商品，退购一个商品，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py b/YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py index 7da7dbe..bd1338a 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购2个打折商品，退购一个，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.data.WuShangSceneTestData import * diff --git a/YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py b/YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py index be189a8..592fe5e 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购2个促销白名单商品，退购一个，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi diff --git a/YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py b/YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py index 7ecbcf9..44b84a3 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py +++ b/YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py @@ -3,7 +3,7 @@ # @Author:: Arthur Wu # @Description:: 游客转会员登录，加购2个重量放通商品，退购一个，并结算 # @Date:: 2024/11/21 -import unittest,allure,time +import unittest,allure,time,pytest from configs.globalObj import LOGGER from YiMao.businessFunc.ClientApiLib import YMClientApi from YiMao.businessFunc.ServiceApiLib import YMServiceApi