Skip to content

X
xm-uitest-sow
Commit 43bf0444 by linguangwei
Options

review

parent 24ea03c6
Showing with 22 additions and 13 deletions
.idea/workspace.xml
...@@ -4,13 +4,11 @@ ...@@ -4,13 +4,11 @@
<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="review"> <list default="true" id="00f4febb-36b6-426d-bfe6-b023876a617e" name="Default Changelist" comment="allure添加截图">
<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$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/testcase/test_LivePage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/test_LivePage.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_LoginPage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/test_LoginPage.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/testcase/test_LoginPage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/test_LoginPage.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/testcase/test_WhiteBoardPage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/test_WhiteBoardPage.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/testcase/test_MainPage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/test_MainPage.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" />
...@@ -382,7 +380,14 @@ ...@@ -382,7 +380,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1624345577551</updated> <updated>1624345577551</updated>
</task> </task>
<option name="localTasksCounter" value="16" /> <task id="LOCAL-00016" summary="allure添加截图">
<created>1624420681115</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1624420681115</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -491,7 +496,8 @@ ...@@ -491,7 +496,8 @@
<MESSAGE value="添加测试白板的page和testcase" /> <MESSAGE value="添加测试白板的page和testcase" />
<MESSAGE value="修改为pytest框架" /> <MESSAGE value="修改为pytest框架" />
<MESSAGE value="review" /> <MESSAGE value="review" />
<option name="LAST_COMMIT_MESSAGE" value="review" /> <MESSAGE value="allure添加截图" />
<option name="LAST_COMMIT_MESSAGE" value="allure添加截图" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/server.log" /> <entry file="file://$PROJECT_DIR$/server.log" />
......
src/testcase/test_LivePage.py
import time import time
import allure
import pytest import pytest
from src.framework.logger import Logger from src.framework.logger import Logger
...@@ -36,7 +37,8 @@ class TestLivePage(object): ...@@ -36,7 +37,8 @@ class TestLivePage(object):
def teardown_class(self): def teardown_class(self):
self.driver.quit() self.driver.quit()
# 测试直播间摄像头 测试的时候如果摄像头黑屏，检查一下是否开了两个客户端，造成了摄像头抢占 @allure.title("测试直播间摄像头")
@allure.description("测试的时候如果摄像头黑屏，检查一下是否开了两个客户端，造成了摄像头抢占")
def testLiveCamera(self): def testLiveCamera(self):
before_savescreen = screenshot_path(sys._getframe().f_code.co_name) + "/" + year_to_minute() + '.png' before_savescreen = screenshot_path(sys._getframe().f_code.co_name) + "/" + year_to_minute() + '.png'
self.live_page.save_screenshot(before_savescreen) self.live_page.save_screenshot(before_savescreen)
...@@ -48,7 +50,7 @@ class TestLivePage(object): ...@@ -48,7 +50,7 @@ class TestLivePage(object):
assert 10 < result assert 10 < result
self.live_page.sleep(3) self.live_page.sleep(3)
# 测试添加白板并打开 @allure.title("测试添加白板并打开")
def testWhiteBoard(self): def testWhiteBoard(self):
self.live_page.click_white_board() self.live_page.click_white_board()
self.live_page.sleep(2) self.live_page.sleep(2)
......
src/testcase/test_LoginPage.py
...@@ -20,7 +20,7 @@ class TestLoginPage(object): ...@@ -20,7 +20,7 @@ class TestLoginPage(object):
def teardown_class(self): def teardown_class(self):
self.driver.quit() self.driver.quit()
# 测试登录 @allure.title("测试登录")
@pytest.fixture() @pytest.fixture()
def testLogin(self): def testLogin(self):
login_page = LoginPage(driver=self.driver) login_page = LoginPage(driver=self.driver)
......
src/testcase/test_MainPage.py
import time import time
import allure
import pytest import pytest
from src.framework.logger import Logger from src.framework.logger import Logger
...@@ -23,7 +24,7 @@ class TestMainPage(object): ...@@ -23,7 +24,7 @@ class TestMainPage(object):
def teardown_method(self): def teardown_method(self):
self.driver.quit() self.driver.quit()
# 测试主页-进入未开启直播 @allure.title("测试主页-进入未开启直播")
def test_1_UnStartLive(self): def test_1_UnStartLive(self):
driver = self.driver driver = self.driver
main_page = MainPage(driver=driver) main_page = MainPage(driver=driver)
...@@ -40,7 +41,7 @@ class TestMainPage(object): ...@@ -40,7 +41,7 @@ class TestMainPage(object):
assert main_page.ifElementExist(main_page.camera_btn) assert main_page.ifElementExist(main_page.camera_btn)
main_page.sleep(3) main_page.sleep(3)
# 测试主页-进入已开启直播 @allure.title("测试主页-进入已开启直播")
def test_2_StartLive(self): def test_2_StartLive(self):
driver = self.driver driver = self.driver
main_page = MainPage(driver=driver) main_page = MainPage(driver=driver)
...@@ -69,7 +70,7 @@ class TestMainPage(object): ...@@ -69,7 +70,7 @@ class TestMainPage(object):
assert "查看回放" == main_page.get_btn_text(self.live_course_name[1]) assert "查看回放" == main_page.get_btn_text(self.live_course_name[1])
main_page.sleep(3) main_page.sleep(3)
# 测试回放 @allure.title("测试回放")
def test_3_ReviewLive(self): def test_3_ReviewLive(self):
driver = self.driver driver = self.driver
main_page = MainPage(driver=driver) main_page = MainPage(driver=driver)
......
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