Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
易企天创
zentaoatf
提交
a4575bf6
Z
zentaoatf
项目概览
易企天创
/
zentaoatf
10 个月 前同步成功
通知
11
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
3
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Z
zentaoatf
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
3
Issue
3
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a4575bf6
编写于
12月 17, 2020
作者:
aaronchen2k2k
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
close task#8649
上级
f0655f95
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
92 addition
and
12 deletion
+92
-12
src/action/bug.go
src/action/bug.go
+1
-1
src/action/ztfResult.go
src/action/ztfResult.go
+1
-1
src/server/model/sysInfo.go
src/server/model/sysInfo.go
+2
-0
src/server/server.go
src/server/server.go
+13
-1
src/server/utils/common/request.go
src/server/utils/common/request.go
+0
-0
src/server/utils/common/sys.go
src/server/utils/common/sys.go
+60
-1
src/server/utils/const/const.go
src/server/utils/const/const.go
+2
-0
src/utils/const/const.go
src/utils/const/const.go
+2
-0
src/utils/file/file.go
src/utils/file/file.go
+4
-4
src/utils/vari/var.go
src/utils/vari/var.go
+4
-3
src/utils/zentao/zentao.go
src/utils/zentao/zentao.go
+1
-1
src/ztf.go
src/ztf.go
+2
-0
未找到文件。
src/action/bug.go
浏览文件 @
a4575bf6
...
...
@@ -23,7 +23,7 @@ func CommitBug(files []string) {
}
else
{
stdinUtils
.
InputForDir
(
&
resultDir
,
""
,
"result"
)
}
resultDir
=
fileUtils
.
UpdateDir
(
resultDir
)
resultDir
=
fileUtils
.
AddPathSepIfNeeded
(
resultDir
)
report
:=
testingService
.
GetZTFTestReportForSubmit
(
resultDir
)
...
...
src/action/ztfResult.go
浏览文件 @
a4575bf6
...
...
@@ -14,6 +14,6 @@ func CommitZTFTestResult(files []string, productId string, taskId string, noNeed
stdinUtils
.
InputForDir
(
&
resultDir
,
""
,
"result"
)
}
resultDir
=
fileUtils
.
UpdateDir
(
resultDir
)
resultDir
=
fileUtils
.
AddPathSepIfNeeded
(
resultDir
)
zentaoService
.
CommitZTFTestResult
(
resultDir
,
productId
,
taskId
,
noNeedConfirm
)
}
src/server/model/sysInfo.go
浏览文件 @
a4575bf6
package
serverModel
type
SysInfo
struct
{
AgentDir
string
`json:"agentDir"`
SysArch
string
`json:"sysArch"`
SysCores
int
`json:"sysCores"`
...
...
src/server/server.go
浏览文件 @
a4575bf6
...
...
@@ -5,7 +5,10 @@ import (
"fmt"
serverModel
"github.com/easysoft/zentaoatf/src/server/model"
"github.com/easysoft/zentaoatf/src/server/service"
serverUtils
"github.com/easysoft/zentaoatf/src/server/utils"
serverUtils
"github.com/easysoft/zentaoatf/src/server/utils/common"
serverConst
"github.com/easysoft/zentaoatf/src/server/utils/const"
constant
"github.com/easysoft/zentaoatf/src/utils/const"
fileUtils
"github.com/easysoft/zentaoatf/src/utils/file"
"github.com/easysoft/zentaoatf/src/utils/vari"
"io"
"io/ioutil"
...
...
@@ -27,6 +30,15 @@ func NewServer() *Server {
return
&
Server
{
commonService
:
commonService
,
agentService
:
agentService
,
cronService
:
cronService
}
}
func
(
s
*
Server
)
Init
()
{
if
vari
.
AgentDir
!=
""
{
return
}
home
,
_
:=
serverUtils
.
GetUserHome
()
vari
.
AgentDir
=
fileUtils
.
AddPathSepIfNeeded
(
home
+
constant
.
PthSep
+
serverConst
.
AgentDir
)
}
func
(
s
*
Server
)
Run
()
{
httpServer
:=
&
http
.
Server
{
Addr
:
fmt
.
Sprintf
(
":%d"
,
vari
.
Port
),
...
...
src/server/utils/request.go
→
src/server/utils/
common/
request.go
浏览文件 @
a4575bf6
文件已移动
src/server/utils/common/sys.go
浏览文件 @
a4575bf6
package
common
Utils
package
server
Utils
import
(
"bytes"
"errors"
serverModel
"github.com/easysoft/zentaoatf/src/server/model"
"github.com/easysoft/zentaoatf/src/utils/vari"
"os"
"os/exec"
"os/user"
"runtime"
"strings"
)
func
GetSysInfo
()
(
info
serverModel
.
SysInfo
)
{
info
.
AgentDir
=
vari
.
AgentDir
info
.
SysArch
=
runtime
.
GOARCH
info
.
SysCores
=
runtime
.
GOMAXPROCS
(
0
)
...
...
@@ -23,3 +30,55 @@ func GetSysInfo() (info serverModel.SysInfo) {
return
}
func
GetUserHome
()
(
string
,
error
)
{
user
,
err
:=
user
.
Current
()
if
nil
==
err
{
return
user
.
HomeDir
,
nil
}
// cross compile support
if
"windows"
==
runtime
.
GOOS
{
return
homeWindows
()
}
// Unix-like system, so just assume Unix
return
homeUnix
()
}
func
homeUnix
()
(
string
,
error
)
{
// First prefer the HOME environmental variable
if
home
:=
os
.
Getenv
(
"HOME"
);
home
!=
""
{
return
home
,
nil
}
// If that fails, try the shell
var
stdout
bytes
.
Buffer
cmd
:=
exec
.
Command
(
"sh"
,
"-c"
,
"eval echo ~$USER"
)
cmd
.
Stdout
=
&
stdout
if
err
:=
cmd
.
Run
();
err
!=
nil
{
return
""
,
err
}
result
:=
strings
.
TrimSpace
(
stdout
.
String
())
if
result
==
""
{
return
""
,
errors
.
New
(
"blank output when reading home directory"
)
}
return
result
,
nil
}
func
homeWindows
()
(
string
,
error
)
{
drive
:=
os
.
Getenv
(
"HOMEDRIVE"
)
path
:=
os
.
Getenv
(
"HOMEPATH"
)
home
:=
drive
+
path
if
drive
==
""
||
path
==
""
{
home
=
os
.
Getenv
(
"USERPROFILE"
)
}
if
home
==
""
{
return
""
,
errors
.
New
(
"HOMEDRIVE, HOMEPATH, and USERPROFILE are blank"
)
}
return
home
,
nil
}
src/server/utils/const/const.go
浏览文件 @
a4575bf6
...
...
@@ -2,4 +2,6 @@ package serverConst
const
(
HeartBeatInterval
=
5
AgentDir
=
"ztf_agent"
)
src/utils/const/const.go
浏览文件 @
a4575bf6
...
...
@@ -6,6 +6,8 @@ import (
)
var
(
PthSep
=
string
(
os
.
PathSeparator
)
ConfigVer
=
1
ConfigFile
=
fmt
.
Sprintf
(
"conf%sztf.conf"
,
string
(
os
.
PathSeparator
))
...
...
src/utils/file/file.go
浏览文件 @
a4575bf6
...
...
@@ -78,7 +78,7 @@ func AbosutePath(pth string) string {
pth
,
_
=
filepath
.
Abs
(
pth
)
}
pth
=
UpdateDir
(
pth
)
pth
=
AddPathSepIfNeeded
(
pth
)
return
pth
}
...
...
@@ -88,7 +88,7 @@ func IsAbosutePath(pth string) bool {
strings
.
Index
(
pth
,
":"
)
==
1
// windows
}
func
UpdateDir
(
pth
string
)
string
{
func
AddPathSepIfNeeded
(
pth
string
)
string
{
sepa
:=
string
(
os
.
PathSeparator
)
if
strings
.
LastIndex
(
pth
,
sepa
)
<
len
(
pth
)
-
1
{
...
...
@@ -148,7 +148,7 @@ func GetZTFDir() string { // where ztf command in
}
dir
,
_
=
filepath
.
Abs
(
dir
)
dir
=
UpdateDir
(
dir
)
dir
=
AddPathSepIfNeeded
(
dir
)
//fmt.Printf("Debug: Launch %s in %s \n", arg1, dir)
return
dir
...
...
@@ -195,7 +195,7 @@ func GetLogDir() string {
ret
:=
getLogNumb
(
numb
+
1
)
return
UpdateDir
(
path
+
ret
)
return
AddPathSepIfNeeded
(
path
+
ret
)
}
func
getLogNumb
(
numb
int
)
string
{
...
...
src/utils/vari/var.go
浏览文件 @
a4575bf6
...
...
@@ -40,7 +40,8 @@ var (
Interpreter
string
// server
RunMode
string
IP
string
Port
int
RunMode
string
IP
string
Port
int
AgentDir
string
)
src/utils/zentao/zentao.go
浏览文件 @
a4575bf6
...
...
@@ -290,7 +290,7 @@ func ReadCaseId(content string) string {
}
func
GetDependentExpect
(
file
string
)
(
bool
,
string
)
{
dir
:=
fileUtils
.
UpdateDir
(
filepath
.
Dir
(
file
))
dir
:=
fileUtils
.
AddPathSepIfNeeded
(
filepath
.
Dir
(
file
))
name
:=
strings
.
Replace
(
filepath
.
Base
(
file
),
path
.
Ext
(
file
),
".exp"
,
-
1
)
expectIndependentFile
:=
dir
+
name
...
...
src/ztf.go
浏览文件 @
a4575bf6
...
...
@@ -75,6 +75,7 @@ func main() {
flagSet
.
IntVar
(
&
vari
.
Port
,
"P"
,
8848
,
""
)
flagSet
.
IntVar
(
&
vari
.
Port
,
"port"
,
8848
,
""
)
flagSet
.
StringVar
(
&
vari
.
AgentDir
,
"w"
,
""
,
""
)
var
placeholder
string
flagSet
.
StringVar
(
&
placeholder
,
"h"
,
""
,
""
)
...
...
@@ -227,6 +228,7 @@ func startServer() {
logUtils
.
PrintToWithColor
(
i118Utils
.
I118Prt
.
Sprintf
(
"start_server"
,
vari
.
IP
,
strconv
.
Itoa
(
vari
.
Port
)),
color
.
FgCyan
)
server
:=
server
.
NewServer
()
server
.
Init
()
server
.
Run
()
return
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录