Merge remote-tracking branch 'origin/master'

# Conflicts:
#	config.py

.gitignore

@@ -16,7 +16,7 @@ build
 log
 test.py
 .idea
-report/:
+report/tmp:
 # Environments
 .env
 .venv
\ No newline at end of file

Pipfile

@@ -5,12 +5,12 @@ name = "aliyun"
 
 [packages]
 requests = "==2.22.0"
-xlrd = "==2.0.0"
 pytest = "==6.0.1"
 allure-pytest = "==2.8.18"
 redis = "==3.5.3"
 pymysql = "==0.9.3"
 pycryptodome = "*"
+xlrd = "==1.2.0"
 
 [dev-packages]
 

Pipfile.lock

 {
     "_meta": {
         "hash": {
-            "sha256": "31c5acc534a4ae37174f8e26aec0db2e2ef5885ff8dbe54f349904ea7a523c7e"
+            "sha256": "b596032d7883761b5022d64a01df3e534a2ea1d5050ab4b52dce20d31a7bddcc"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -185,11 +185,11 @@
         },
         "six": {
             "hashes": [
-                "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
-                "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
+                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
+                "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.15.0"
+            "version": "==1.16.0"
         },
         "toml": {
             "hashes": [
@@ -218,11 +218,11 @@
         },
         "xlrd": {
             "hashes": [
-                "sha256:27aad20e1aa30c5062665dc37b6530c32eb2e24229b1568554f0cadab4b75457",
-                "sha256:e1ae0dbdb0a4888e381255f9aefe3efcd7ea64a35666e7a03c3f3c9e4b44641b"
+                "sha256:546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2",
+                "sha256:e551fb498759fa3a5384a94ccd4c3c02eb7c00ea424426e212ac0c57be9dfbde"
             ],
             "index": "aliyun",
-            "version": "==2.0.0"
+            "version": "==1.2.0"
         },
         "zipp": {
             "hashes": [

test_case/bmy/test_login.py

@@ -12,7 +12,7 @@ from config import BmyConfig
 @allure.epic("营运车企业端")
 @allure.feature("登录模块")
 class TestLogin():
-    workBook = xlrd.open_workbook('../../test_case_data/bmy/bmy_case.xlsx')
+    workBook = xlrd.open_workbook('test_case_data/bmy/bmy_case.xlsx')
 
     @allure.story("登录")
     @allure.title("登录认证")

test_case/conftest.py

@@ -5,5 +5,4 @@ import pytest
 
 @pytest.fixture(scope="function",autouse=True)
 def sleep():
-    print("wait wait")
     time.sleep(config.BaseConfig.secs)
\ No newline at end of file