Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
29f0aec4
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
29f0aec4
编写于
3月 29, 2021
作者:
M
Medya Ghazizadeh
提交者:
GitHub
3月 29, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10920 from anencore94/cp_window
Fix to minikube cp functional test work on windows os
上级
3efdadb6
4f9aac3a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
7 deletion
+24
-7
cmd/minikube/cmd/cp.go
cmd/minikube/cmd/cp.go
+2
-2
test/integration/functional_test.go
test/integration/functional_test.go
+22
-5
未找到文件。
cmd/minikube/cmd/cp.go
浏览文件 @
29f0aec4
...
...
@@ -22,7 +22,7 @@ import (
"os"
pt
"path"
"
path/filepath
"
"
strings
"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/exit"
...
...
@@ -87,7 +87,7 @@ func validateArgs(srcPath string, dstPath string) {
}
}
if
!
filepath
.
IsAbs
(
dstPath
)
{
if
!
strings
.
HasPrefix
(
dstPath
,
"/"
)
{
exit
.
Message
(
reason
.
Usage
,
`<target file absolute path> must be an absolute Path. Relative Path is not allowed (example: "/home/docker/copied.txt")`
)
}
}
test/integration/functional_test.go
浏览文件 @
29f0aec4
...
...
@@ -1234,14 +1234,26 @@ func validateSSHCmd(ctx context.Context, t *testing.T, profile string) {
}
}
// cpTestMinikubePath is where the test file will be located in the Minikube instance
func
cpTestMinikubePath
()
string
{
return
"/home/docker/cp-test.txt"
}
// cpTestLocalPath is where the test file located in host os
func
cpTestLocalPath
()
string
{
return
filepath
.
Join
(
*
testdataDir
,
"cp-test.txt"
)
}
// validateCpCmd asserts basic "cp" command functionality
func
validateCpCmd
(
ctx
context
.
Context
,
t
*
testing
.
T
,
profile
string
)
{
if
NoneDriver
()
{
t
.
Skipf
(
"skipping: cp is unsupported by none driver"
)
}
cpPath
:=
filepath
.
Join
(
*
testdataDir
,
"cp-test.txt"
)
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"-p"
,
profile
,
"cp"
,
cpPath
,
"/home/docker/hello_cp.txt"
))
srcPath
:=
cpTestLocalPath
()
dstPath
:=
cpTestMinikubePath
()
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"-p"
,
profile
,
"cp"
,
srcPath
,
dstPath
))
if
ctx
.
Err
()
==
context
.
DeadlineExceeded
{
t
.
Errorf
(
"failed to run command by deadline. exceeded timeout : %s"
,
rr
.
Command
())
}
...
...
@@ -1249,15 +1261,20 @@ func validateCpCmd(ctx context.Context, t *testing.T, profile string) {
t
.
Errorf
(
"failed to run an cp command. args %q : %v"
,
rr
.
Command
(),
err
)
}
expected
:=
"Test file for checking file cp process"
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"-p"
,
profile
,
"ssh"
,
"cat /home/docker/hello_cp.txt"
))
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"-p"
,
profile
,
"ssh"
,
fmt
.
Sprintf
(
"sudo cat %s"
,
dstPath
)))
if
ctx
.
Err
()
==
context
.
DeadlineExceeded
{
t
.
Errorf
(
"failed to run command by deadline. exceeded timeout : %s"
,
rr
.
Command
())
}
if
err
!=
nil
{
t
.
Errorf
(
"failed to run an cp command. args %q : %v"
,
rr
.
Command
(),
err
)
}
if
diff
:=
cmp
.
Diff
(
expected
,
rr
.
Stdout
.
String
());
diff
!=
""
{
expected
,
err
:=
ioutil
.
ReadFile
(
srcPath
)
if
err
!=
nil
{
t
.
Errorf
(
"failed to read test file 'testdata/cp-test.txt' : %v"
,
err
)
}
if
diff
:=
cmp
.
Diff
(
string
(
expected
),
rr
.
Stdout
.
String
());
diff
!=
""
{
t
.
Errorf
(
"/testdata/cp-test.txt content mismatch (-want +got):
\n
%s"
,
diff
)
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录