github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2274 from estesp/debug-travis

Browse Source 
Fix broken tests; make sure we don't mask travis script exit codes
This commit is contained in:
Derek McGowan 2018-04-04 13:24:59 -07:00 committed by GitHub
commit 49139695aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -75,10 +75,8 @@ script:
sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log & sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log &
sudo ctr version ; sudo ctr version ;
sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8 ; sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8 ;
exit_code=$? ; test $? -ne 0 && cat /tmp/containerd-cri.log ;
test $exit_code -ne 0 && cat /tmp/containerd-cri.log ;
sudo pkill containerd ; sudo pkill containerd ;
exit $exit_code ;
fi fi
after_success: after_success:

2
container_linux_test.go
View File

@ -493,7 +493,7 @@ func testContainerUser(t *testing.T, userstr, expectedOutput string) {
var ( var (
image Image image Image
ctx, cancel = testContext() ctx, cancel = testContext()
id = t.Name() id = strings.Replace(t.Name(), "/", "_", -1)
) )
defer cancel() defer cancel()