Commit d975ac0c authored by liyuanhong's avatar liyuanhong

添加了强制pull脚本

parent 733c8040
#! /bin/bash
git fetch --all
git reset --hard origin/master
git pull
\ No newline at end of file
...@@ -26,6 +26,7 @@ def h264FilePushTest(): ...@@ -26,6 +26,7 @@ def h264FilePushTest():
test.setAudioPath("aac/bbb3.aac") test.setAudioPath("aac/bbb3.aac")
test.start() test.start()
def getPressTestObj(): def getPressTestObj():
test = FlvPressureTest() test = FlvPressureTest()
test.setHost("10.100.11.125") test.setHost("10.100.11.125")
...@@ -35,7 +36,7 @@ def getPressTestObj(): ...@@ -35,7 +36,7 @@ def getPressTestObj():
test.setTerNum(3) # 要启动的推拉流线程 test.setTerNum(3) # 要启动的推拉流线程
test.setIsOpenPullStream(1) # 设置是否开启拉流 test.setIsOpenPullStream(1) # 设置是否开启拉流
test.setIsShowFrame(0) # 拉流是否显示预览画面 (压力测试都应该填:0) test.setIsShowFrame(0) # 拉流是否显示预览画面 (压力测试都应该填:0)
test.setSendDur(0.005) # 设置socket 发送数据间隔 test.setSendDur(0.007) # 设置socket 发送数据间隔
test.setFlvPath("flv/aaa3.flv") # 设置视频路劲 test.setFlvPath("flv/aaa3.flv") # 设置视频路劲
test.start() test.start()
return test return test
......
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