diff --git a/001_login_get_info/login_customer.robot b/001_login_get_info/login_customer.robot index 70ca6f3..45c3c9e 100644 --- a/001_login_get_info/login_customer.robot +++ b/001_login_get_info/login_customer.robot @@ -57,12 +57,13 @@ customer_login_token Log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} #Should Be Equal As Strings successful ${response.json()["message"]} - ${getlogintoken_customer} Get From Dictionary ${response.json()} data - log ${getlogintoken_customer} + ${get_status} ${token} Run Keyword And Ignore Error Get From Dictionary ${response.json()} data + ${getlogintoken_customer} Set Variable If "${get_status}"=="FAIL" ${gettoken_customer} + ... "${token}"=="None" ${gettoken_customer} ${token} #全局token Set Global Variable ${getlogintoken_customer} #&{cloudfactory_customer_header} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${getlogintoken_customer} - &{cloudfactory_customer_header} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${gettoken_customer} + &{cloudfactory_customer_header} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${getlogintoken_customer} Set Suite Variable ${cloudfactory_customer_header} get_customer_userinfo diff --git a/001_login_get_info/login_supplier.robot b/001_login_get_info/login_supplier.robot index bbb2caa..e061973 100644 --- a/001_login_get_info/login_supplier.robot +++ b/001_login_get_info/login_supplier.robot @@ -57,8 +57,9 @@ supplier_login_token Log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} #Should Be Equal As Strings successful ${response.json()["message"]} - ${getlogintoken_supplier} Get From Dictionary ${response.json()} data - log ${getlogintoken_supplier} + ${get_status} ${token} Run Keyword And Ignore Error Get From Dictionary ${response.json()} data + ${getlogintoken_supplier} Set Variable If "${get_status}"=="FAIL" ${gettoken_supplier} + ... "${token}"=="None" ${gettoken_supplier} ${token} #全局token Set Global Variable ${getlogintoken_supplier} #&{cloudfactory_supplierheader} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 Authorization=${getlogintoken_supplier} diff --git a/003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot b/003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot index bfd7fa9..72ff6be 100644 --- a/003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot +++ b/003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library DatabaseLibrary Library RequestsLibrary Library Collections @@ -7,6 +6,9 @@ Library urllib3 *** Variables *** &{operation_backend_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847952999 Authorization=${gettoken_operate} +&{cloud_factory_customer_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 +${uecclient} https://api-client-uec-test.qniao.cn +${yytclient} https://api-client-yyt-test.qniao.cn ${yytops} https://api-ops-yyt-test.qniao.cn ${uecops} https://api-ops-uec-test.qniao.cn @@ -276,3 +278,57 @@ operate_get_printing_packaging_factory_employee_list Should Be Equal As Strings successful ${response.json()["message"]} Should Be Equal As Strings ${printing_packaging_factory_administrator_mobile} ${response.json()["data"]["records"][0]["mobile"]} Should Be Equal As Strings ${printing_packaging_factory_administrator_realname} ${response.json()["data"]["records"][0]["realName"]} + +customer_phone + #去除警告 + Disable Warnings + #创建会话 会话别名 baseurl headers + Create Session uecclient ${uecclient} headers=${cloud_factory_customer_header} + #变量名称 设置用例变量 变量值 + ${accounttype} Set Variable 2 #账号类型 1微信 2手机号 3邮箱 4苹果 5自定义账号 + ${account} Set Variable 13012345678 + ${body} Set Variable {"accountType":${accounttype},"account":"${account}","captcha":"888888"} + #变量接收响应结果 post请求 会话别名 uri 传参 + ${response} POST On Session uecclient /uec/authorize/by-captcha ${body} + #日志 + Log ${response.status_code} + #日志 + Log ${response.text} + #日志 + Log ${response.json()} + #断言数字 预期结果 实际结果 + Should Be Equal As Numbers 200 ${response.status_code} + #断言字符串 预期结果 实际结果 + Should Be Equal As Strings successful ${response.json()["message"]} + #变量接收token 获取字典内容 响应结果 token-key + ${gettoken_customer} Get From Dictionary ${response.json()["data"]} token + #日志 + log ${gettoken_customer} + #设置token变量 未转业务线 + Set Suite Variable ${gettoken_customer} + #变量接收客户userid 获取字典内容 响应结果 userid-key + ${userid_customer} Get From Dictionary ${response.json()["data"]} userId + #日志 + log ${userid_customer} + #设置token变量 + Set Suite Variable ${userid_customer} + #设置带token的请求头 + &{cloudfactorycustomerheader} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${gettoken_customer} + #设置token变量 + Set Suite Variable ${cloudfactorycustomerheader} + +customer_login_token + Disable Warnings + Create Session yytclient ${yytclient} headers=${cloudfactorycustomerheader} + ${body} Set Variable {"loginToken":"${gettoken_customer}"} + ${response} POST On Session yytclient /cloud-print-user-center/authorize/get/product-line-token/by/login-token ${body.encode("utf8")} + Log ${response.status_code} + Log ${response.json()} + Should Be Equal As Numbers 200 ${response.status_code} + Should Be Equal As Strings successful ${response.json()["message"]} + ${getlogintoken_customer} Get From Dictionary ${response.json()} data + log ${getlogintoken_customer} + #全局token + Set Global Variable ${getlogintoken_customer} + &{cloudfactory_customer_header} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${getlogintoken_customer} + Set Global Variable ${cloudfactory_customer_header} diff --git a/004_enterprise_open_account_supplier/supplier_paper_open_account.robot b/004_enterprise_open_account_supplier/supplier_paper_open_account.robot index fd738f9..12bbe14 100644 --- a/004_enterprise_open_account_supplier/supplier_paper_open_account.robot +++ b/004_enterprise_open_account_supplier/supplier_paper_open_account.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library DatabaseLibrary Library RequestsLibrary Library Collections @@ -8,6 +7,7 @@ Library urllib3 *** Variables *** &{cloudfactory_supplierfocus_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 Authorization=${getlogintoken_supplier_focus} &{operation_backend_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847952999 Authorization=${gettoken_operate} +&{cloud_factory_supplier_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 ${uecclient} https://api-client-uec-test.qniao.cn ${yytclient} https://api-client-yyt-test.qniao.cn ${uecops} https://api-ops-uec-test.qniao.cn @@ -250,3 +250,57 @@ operate_get_supplier_paper_purchase_order_list log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} + +supplier_phone + #去除警告 + Disable Warnings + #创建会话 会话别名 baseurl headers + Create Session uecclient ${uecclient} headers=${cloud_factory_supplier_header} + #变量名称 设置用例变量 变量值 + ${accounttype} Set Variable 2 #账号类型 1微信 2手机号 3邮箱 4苹果 5自定义账号 + ${account} Set Variable 13123456789 + ${body} Set Variable {"accountType":${accounttype},"account":"${account}","captcha":"888888"} + #变量接收响应结果 post请求 会话别名 uri 传参 + ${response} POST On Session uecclient /uec/authorize/by-captcha ${body} + #日志 + Log ${response.status_code} + #日志 + Log ${response.text} + #日志 + Log ${response.json()} + #断言数字 预期结果 实际结果 + Should Be Equal As Numbers 200 ${response.status_code} + #断言字符串 预期结果 实际结果 + Should Be Equal As Strings successful ${response.json()["message"]} + #变量接收token 获取字典内容 响应结果 token-key + ${gettoken_supplier} Get From Dictionary ${response.json()["data"]} token + #日志 + log ${gettoken_supplier} + #设置token变量 未转业务线 + Set Suite Variable ${gettoken_supplier} + #变量接收供应商userid 获取字典内容 响应结果 userid-key + ${userid_supplier} Get From Dictionary ${response.json()["data"]} userId + #日志 + log ${userid_supplier} + #设置token变量 + Set Suite Variable ${userid_supplier} + #设置带token的请求头 + &{cloudfactorysupplierheader} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 Authorization=${gettoken_supplier} + #设置token变量 + Set Suite Variable ${cloudfactorysupplierheader} + +supplier_login_token + Disable Warnings + Create Session yytclient ${yytclient} headers=${cloudfactorysupplierheader} + ${body} Set Variable {"loginToken":"${gettoken_supplier}"} + ${response} POST On Session yytclient /cloud-print-user-center/authorize/get/product-line-token/by/login-token ${body.encode("utf8")} + Log ${response.status_code} + Log ${response.json()} + Should Be Equal As Numbers 200 ${response.status_code} + Should Be Equal As Strings successful ${response.json()["message"]} + ${getlogintoken_supplier} Get From Dictionary ${response.json()} data + log ${getlogintoken_supplier} + #全局token + Set Global Variable ${getlogintoken_supplier} + &{cloudfactory_supplierheader} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 Authorization=${getlogintoken_supplier} + Set Global Variable ${cloudfactory_supplierheader} diff --git a/005_enterprise_apply_credit/apply_credit_qniao_customer.robot b/005_enterprise_apply_credit/apply_credit_qniao_customer.robot index c05cd46..e7dd247 100644 --- a/005_enterprise_apply_credit/apply_credit_qniao_customer.robot +++ b/005_enterprise_apply_credit/apply_credit_qniao_customer.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/006_get_credit/customer_credit_password.robot b/006_get_credit/customer_credit_password.robot index 9677e4f..ea65ecb 100644 --- a/006_get_credit/customer_credit_password.robot +++ b/006_get_credit/customer_credit_password.robot @@ -1,69 +1,13 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 *** Variables *** -&{cloud_factory_customer_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 -${uecclient} https://api-client-uec-test.qniao.cn +&{cloudfactory_customer_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${getlogintoken_customer} ${yytclient} https://api-client-yyt-test.qniao.cn *** Test Cases *** -customer_phone - #去除警告 - Disable Warnings - #创建会话 会话别名 baseurl headers - Create Session uecclient ${uecclient} headers=${cloud_factory_customer_header} - #变量名称 设置用例变量 变量值 - ${accounttype} Set Variable 2 #账号类型 1微信 2手机号 3邮箱 4苹果 5自定义账号 - ${account} Set Variable 13012345678 - ${body} Set Variable {"accountType":${accounttype},"account":"${account}","captcha":"888888"} - #变量接收响应结果 post请求 会话别名 uri 传参 - ${response} POST On Session uecclient /uec/authorize/by-captcha ${body} - #日志 - Log ${response.status_code} - #日志 - Log ${response.text} - #日志 - Log ${response.json()} - #断言数字 预期结果 实际结果 - Should Be Equal As Numbers 200 ${response.status_code} - #断言字符串 预期结果 实际结果 - Should Be Equal As Strings successful ${response.json()["message"]} - #变量接收token 获取字典内容 响应结果 token-key - ${gettoken_customer} Get From Dictionary ${response.json()["data"]} token - #日志 - log ${gettoken_customer} - #设置token变量 未转业务线 - Set Suite Variable ${gettoken_customer} - #变量接收客户userid 获取字典内容 响应结果 userid-key - ${userid_customer} Get From Dictionary ${response.json()["data"]} userId - #日志 - log ${userid_customer} - #设置token变量 - Set Suite Variable ${userid_customer} - #设置带token的请求头 - &{cloudfactorycustomerheader} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${gettoken_customer} - #设置token变量 - Set Suite Variable ${cloudfactorycustomerheader} - -customer_login_token - Disable Warnings - Create Session yytclient ${yytclient} headers=${cloudfactorycustomerheader} - ${body} Set Variable {"loginToken":"${gettoken_customer}"} - ${response} POST On Session yytclient /cloud-print-user-center/authorize/get/product-line-token/by/login-token ${body.encode("utf8")} - Log ${response.status_code} - Log ${response.json()} - Should Be Equal As Numbers 200 ${response.status_code} - Should Be Equal As Strings successful ${response.json()["message"]} - ${getlogintoken_customer} Get From Dictionary ${response.json()} data - log ${getlogintoken_customer} - #全局token - Set Global Variable ${getlogintoken_customer} - &{cloudfactory_customer_header} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${getlogintoken_customer} - Set Suite Variable ${cloudfactory_customer_header} - customer_get_credit_password_status Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header} ${response} Get On Session yytclient /cloud-print-user-center/credit/payment-password/getstatus diff --git a/006_get_credit/customer_get_credit.robot b/006_get_credit/customer_get_credit.robot index fca413a..ef02af1 100644 --- a/006_get_credit/customer_get_credit.robot +++ b/006_get_credit/customer_get_credit.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/007_paper_variety_management/paper_brand.robot b/007_paper_variety_management/paper_brand.robot index 035787a..c32c06e 100644 --- a/007_paper_variety_management/paper_brand.robot +++ b/007_paper_variety_management/paper_brand.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/007_paper_variety_management/paper_category.robot b/007_paper_variety_management/paper_category.robot index d41a7e9..6799862 100644 --- a/007_paper_variety_management/paper_category.robot +++ b/007_paper_variety_management/paper_category.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library DatabaseLibrary Library RequestsLibrary Library Collections diff --git a/007_paper_variety_management/paper_manufacturer.robot b/007_paper_variety_management/paper_manufacturer.robot index e57996a..2c2619d 100644 --- a/007_paper_variety_management/paper_manufacturer.robot +++ b/007_paper_variety_management/paper_manufacturer.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/008_market_information/market_information_link.robot b/008_market_information/market_information_link.robot index 545fa35..4e8e1f5 100644 --- a/008_market_information/market_information_link.robot +++ b/008_market_information/market_information_link.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/009_product_manage/product_add_and_list.robot b/009_product_manage/product_add_and_list.robot index e1b4642..2ed6da2 100644 --- a/009_product_manage/product_add_and_list.robot +++ b/009_product_manage/product_add_and_list.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/010_limited_specialoffer/limited_specialoffer_product.robot b/010_limited_specialoffer/limited_specialoffer_product.robot index d0e0d7c..45729dd 100644 --- a/010_limited_specialoffer/limited_specialoffer_product.robot +++ b/010_limited_specialoffer/limited_specialoffer_product.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library DatabaseLibrary Library RequestsLibrary Library Collections diff --git a/011_product_price_config/product_price_config_qniao_and_feisuan.robot b/011_product_price_config/product_price_config_qniao_and_feisuan.robot index be1e5ae..a5dd839 100644 --- a/011_product_price_config/product_price_config_qniao_and_feisuan.robot +++ b/011_product_price_config/product_price_config_qniao_and_feisuan.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/012_product_price_update/product_price_batch_update_purchaseprice.robot b/012_product_price_update/product_price_batch_update_purchaseprice.robot index 6d5a931..b8b02f9 100644 --- a/012_product_price_update/product_price_batch_update_purchaseprice.robot +++ b/012_product_price_update/product_price_batch_update_purchaseprice.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/013_paper_list_and_details/customer_get_paper_list_and_detail.robot b/013_paper_list_and_details/customer_get_paper_list_and_detail.robot index aba4f75..dd416ff 100644 --- a/013_paper_list_and_details/customer_get_paper_list_and_detail.robot +++ b/013_paper_list_and_details/customer_get_paper_list_and_detail.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/014_shinpping_address/customer_enterprise_shipping_address.robot b/014_shinpping_address/customer_enterprise_shipping_address.robot index 2626286..82fb45a 100644 --- a/014_shinpping_address/customer_enterprise_shipping_address.robot +++ b/014_shinpping_address/customer_enterprise_shipping_address.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/015_customer_create_order/customer_create_order_credit_payment.robot b/015_customer_create_order/customer_create_order_credit_payment.robot index 33c8416..4ee2cfb 100644 --- a/015_customer_create_order/customer_create_order_credit_payment.robot +++ b/015_customer_create_order/customer_create_order_credit_payment.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot b/016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot index 4bf9a7b..9eda80f 100644 --- a/016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot +++ b/016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot b/017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot index a043513..e7e7ff0 100644 --- a/017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot +++ b/017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 @@ -7,8 +6,6 @@ Library urllib3 *** Variables *** &{cloudfactory_customer_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${getlogintoken_customer} &{cloudfactory_supplierfocus_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 Authorization=${getlogintoken_supplier_focus} -&{cloud_factory_supplier_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 -${uecclient} https://api-client-uec-test.qniao.cn ${yytclient} https://api-client-yyt-test.qniao.cn *** Test Cases *** @@ -86,69 +83,15 @@ supplierfocus_create_supplier_order_batch Should Be Equal As Strings successful ${response.json()["message"]} sleep 1 -supplier_phone - #去除警告 - Disable Warnings - #创建会话 会话别名 baseurl headers - Create Session uecclient ${uecclient} headers=${cloud_factory_supplier_header} - #变量名称 设置用例变量 变量值 - ${accounttype} Set Variable 2 #账号类型 1微信 2手机号 3邮箱 4苹果 5自定义账号 - ${account} Set Variable 13123456789 - ${body} Set Variable {"accountType":${accounttype},"account":"${account}","captcha":"888888"} - #变量接收响应结果 post请求 会话别名 uri 传参 - ${response} POST On Session uecclient /uec/authorize/by-captcha ${body} - #日志 - Log ${response.status_code} - #日志 - Log ${response.text} - #日志 - Log ${response.json()} - #断言数字 预期结果 实际结果 - Should Be Equal As Numbers 200 ${response.status_code} - #断言字符串 预期结果 实际结果 - Should Be Equal As Strings successful ${response.json()["message"]} - #变量接收token 获取字典内容 响应结果 token-key - ${gettoken_supplier} Get From Dictionary ${response.json()["data"]} token - #日志 - log ${gettoken_supplier} - #设置token变量 未转业务线 - Set Suite Variable ${gettoken_supplier} - #变量接收供应商userid 获取字典内容 响应结果 userid-key - ${userid_supplier} Get From Dictionary ${response.json()["data"]} userId - #日志 - log ${userid_supplier} - #设置token变量 - Set Suite Variable ${userid_supplier} - #设置带token的请求头 - &{cloudfactorysupplierheader} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 Authorization=${gettoken_supplier} - #设置token变量 - Set Suite Variable ${cloudfactorysupplierheader} - -supplier_login_token - Disable Warnings - Create Session yytclient ${yytclient} headers=${cloudfactorysupplierheader} - ${body} Set Variable {"loginToken":"${gettoken_supplier}"} - ${response} POST On Session yytclient /cloud-print-user-center/authorize/get/product-line-token/by/login-token ${body.encode("utf8")} - Log ${response.status_code} - Log ${response.json()} - Should Be Equal As Numbers 200 ${response.status_code} - Should Be Equal As Strings successful ${response.json()["message"]} - ${getlogintoken_supplier} Get From Dictionary ${response.json()} data - log ${getlogintoken_supplier} - #全局token - Set Global Variable ${getlogintoken_supplier} - &{cloudfactory_supplierheader} Create Dictionary Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 Authorization=${getlogintoken_supplier} - Set Suite Variable ${cloudfactory_supplierheader} - supplier_get_order_list - Create Session yytclient ${yytclient} headers=${cloud_factory_supplier_header} + Create Session yytclient ${yytclient} headers=${cloudfactory_supplierheader} ${response} Get On Session yytclient /trading-center/wechatapplet/get/supplier-order-page log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} Should Be Equal As Strings successful ${response.json()["message"]} supplier_get_order_list_search - Create Session yytclient ${yytclient} headers=${cloud_factory_supplier_header} + Create Session yytclient ${yytclient} headers=${cloudfactory_supplierheader} ${param} Set Variable status=2 #供应商获取订单状态 2待送货 ${response} Get On Session yytclient /trading-center/wechatapplet/get/supplier-order-page params=${param} log ${response.json()} @@ -158,7 +101,7 @@ supplier_get_order_list_search Set Global Variable ${supplier_order_id} supplier_get_order_detail2 - Create Session yytclient ${yytclient} headers=${cloud_factory_supplier_header} + Create Session yytclient ${yytclient} headers=${cloudfactory_supplierheader} ${response} Get On Session yytclient /trading-center/wechatapplet/get/supplier-order-detail/${supplier_order_id} log ${response.json()} Should Be Equal As Numbers 200 ${response.status_code} @@ -168,7 +111,7 @@ supplier_get_order_detail2 Set Global Variable ${supplier_order_totalPrice} supplier_confirm_order - Create Session yytclient ${yytclient} headers=${cloud_factory_supplier_header} + Create Session yytclient ${yytclient} headers=${cloudfactory_supplierheader} ${body} Set Variable {"orderId":"${supplier_order_id}"} ${response} POST On Session yytclient /trading-center/seller/confirm/supplier-order-and-sign ${body.encode("utf-8")} log ${response.json()} diff --git a/018_payable_and_receivable/customer_bill.robot b/018_payable_and_receivable/customer_bill.robot index d55c1a9..b7d0963 100644 --- a/018_payable_and_receivable/customer_bill.robot +++ b/018_payable_and_receivable/customer_bill.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/018_payable_and_receivable/payable.robot b/018_payable_and_receivable/payable.robot index 8e06f7e..8300fcb 100644 --- a/018_payable_and_receivable/payable.robot +++ b/018_payable_and_receivable/payable.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/018_payable_and_receivable/receivable.robot b/018_payable_and_receivable/receivable.robot index 6896380..984248d 100644 --- a/018_payable_and_receivable/receivable.robot +++ b/018_payable_and_receivable/receivable.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/019_capacity_market/capacity_commodity.robot b/019_capacity_market/capacity_commodity.robot index 2e1ca3b..d391315 100644 --- a/019_capacity_market/capacity_commodity.robot +++ b/019_capacity_market/capacity_commodity.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/019_capacity_market/capacity_machines.robot b/019_capacity_market/capacity_machines.robot index abcff42..c6ba440 100644 --- a/019_capacity_market/capacity_machines.robot +++ b/019_capacity_market/capacity_machines.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library RequestsLibrary Library Collections Library urllib3 diff --git a/100_test_data_clear.robot b/100_test_data_clear.robot index 31b9bd4..7496f3f 100644 --- a/100_test_data_clear.robot +++ b/100_test_data_clear.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Library DatabaseLibrary Library RequestsLibrary Library Collections diff --git a/__init__.robot b/__init__.robot index 12bc4d2..f02700a 100644 --- a/__init__.robot +++ b/__init__.robot @@ -1,5 +1,4 @@ *** Settings *** -Test Teardown Run Keyword If Test Failed Fatal Error Library DatabaseLibrary Library RequestsLibrary Library Collections