Skip to content

X
xm-uitest-sow
Commit 3407a9cf by linguangwei
Options

review

parent 42699799
Showing with 20 additions and 12 deletions
.idea/workspace.xml
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="00f4febb-36b6-426d-bfe6-b023876a617e" name="Default Changelist" comment="请求头添加enterpriseId,并且设置各个请求头参数为变量，在config.ini中设置"> <list default="true" id="00f4febb-36b6-426d-bfe6-b023876a617e" name="Default Changelist" comment="review">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/readConfig.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/readConfig.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/framework/common.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/framework/common.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pageobject/basepage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pageobject/basepage.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/testcase/test_WhiteBoardPage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/test_WhiteBoardPage.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -457,7 +457,14 @@ ...@@ -457,7 +457,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1625646987045</updated> <updated>1625646987045</updated>
</task> </task>
<option name="localTasksCounter" value="27" /> <task id="LOCAL-00027" summary="review">
<created>1625647121753</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1625647121753</updated>
</task>
<option name="localTasksCounter" value="28" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -570,11 +577,11 @@ ...@@ -570,11 +577,11 @@
<MESSAGE value="操作被隐藏的元素界面可视" /> <MESSAGE value="操作被隐藏的元素界面可视" />
<MESSAGE value="操作被隐藏的元素界面可视-2,公共方法login添加" /> <MESSAGE value="操作被隐藏的元素界面可视-2,公共方法login添加" />
<MESSAGE value="判断当前系统是否为Windows或者darwin(mac)（当前只有两钟系统）" /> <MESSAGE value="判断当前系统是否为Windows或者darwin(mac)（当前只有两钟系统）" />
<MESSAGE value="review" />
<MESSAGE value="添加本地文件路径区分mac/windows" /> <MESSAGE value="添加本地文件路径区分mac/windows" />
<MESSAGE value="增加了调试中的切换环境方法" /> <MESSAGE value="增加了调试中的切换环境方法" />
<MESSAGE value="请求头添加enterpriseId,并且设置各个请求头参数为变量，在config.ini中设置" /> <MESSAGE value="请求头添加enterpriseId,并且设置各个请求头参数为变量，在config.ini中设置" />
<option name="LAST_COMMIT_MESSAGE" value="请求头添加enterpriseId,并且设置各个请求头参数为变量，在config.ini中设置" /> <MESSAGE value="review" />
<option name="LAST_COMMIT_MESSAGE" value="review" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/server.log" /> <entry file="file://$PROJECT_DIR$/server.log" />
......
src/framework/common.py
...@@ -86,8 +86,8 @@ def create_a_live(start_time, start_time2=None): ...@@ -86,8 +86,8 @@ def create_a_live(start_time, start_time2=None):
xmtoken = get_token() xmtoken = get_token()
basic_imforation = readConfig.test_header() basic_imforation = readConfig.test_header()
userId = basic_imforation['userId'] userId = basic_imforation['userId']
storeId =basic_imforation['storeId'] storeId = basic_imforation['storeId']
storeUserId =basic_imforation['storeUserId'] storeUserId = basic_imforation['storeUserId']
enterpriseId = basic_imforation['enterpriseId'] enterpriseId = basic_imforation['enterpriseId']
while xmtoken == "登录过频繁": while xmtoken == "登录过频繁":
# 休息5s是因为可能会登录频繁 # 休息5s是因为可能会登录频繁
...@@ -101,12 +101,12 @@ def create_a_live(start_time, start_time2=None): ...@@ -101,12 +101,12 @@ def create_a_live(start_time, start_time2=None):
# endTime = startTime + 5*60*1000 # endTime = startTime + 5*60*1000
courseName = ''.join(random.sample(string.ascii_letters + string.digits, 8)) courseName = ''.join(random.sample(string.ascii_letters + string.digits, 8))
courseName2 = ''.join(random.sample(string.ascii_letters + string.digits, 8)) courseName2 = ''.join(random.sample(string.ascii_letters + string.digits, 8))
url = "https://gateway.xiaomai5.com/hades/public/courseCloud/createLiveCloudCourse?storeId=1211601438838495999" \ url = "https://gateway.xiaomai5.com/hades/public/courseCloud/createLiveCloudCourse?storeId=" \
"&token={}&storeUserId={}&userId={}".format(xmtoken, storeUserId, userId) "&token={}&storeUserId={}&userId={}".format(storeId, xmtoken, storeUserId, userId)
params = {"adminIds": [], "calendarTime": [calendarTime], "categoryId": "1386892090935164929", params = {"adminIds": [], "calendarTime": [calendarTime], "categoryId": "1386892090935164929",
"endTime": endTime, "needRecord": "YES", "startTime": startTime, "endTime": endTime, "needRecord": "YES", "startTime": startTime,
"courseName": courseName, "storeId": "{}", "teacherId": "{}", "courseName": courseName, "storeId": storeId, "teacherId": userId,
"whetherVisitorsJoin": "NO", "scheduleMediaRequests": [], "operatorId": "{}".format(storeId, userId, userId)} "whetherVisitorsJoin": "NO", "scheduleMediaRequests": [], "operatorId": userId}
data = json.dumps(params) data = json.dumps(params)
headers = {"Content-Type": "application/json; charset=UTF-8", headers = {"Content-Type": "application/json; charset=UTF-8",
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) " "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
......
src/testcase/test_WhiteBoardPage.py
...@@ -29,6 +29,7 @@ class TestLivePage(object): ...@@ -29,6 +29,7 @@ class TestLivePage(object):
self.White_Board_page.sleep(15) self.White_Board_page.sleep(15)
self.White_Board_page.login() self.White_Board_page.login()
self.White_Board_page.sleep(2) self.White_Board_page.sleep(2)
print(live_course_name[0])
self.White_Board_page.click_in_live_btn(live_course_name[0]) self.White_Board_page.click_in_live_btn(live_course_name[0])
self.White_Board_page.sleep(5) self.White_Board_page.sleep(5)
self.White_Board_page.change_window(self.White_Board_page.camera_btn) self.White_Board_page.change_window(self.White_Board_page.camera_btn)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment