mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 18:43:34 +00:00
vendor update for CSI 0.3.0
This commit is contained in:
2
vendor/k8s.io/kubernetes/third_party/forked/golang/reflect/deep_equal.go
generated
vendored
2
vendor/k8s.io/kubernetes/third_party/forked/golang/reflect/deep_equal.go
generated
vendored
@ -44,7 +44,7 @@ func (e Equalities) AddFunc(eqFunc interface{}) error {
|
||||
return fmt.Errorf("expected func, got: %v", ft)
|
||||
}
|
||||
if ft.NumIn() != 2 {
|
||||
return fmt.Errorf("expected three 'in' params, got: %v", ft)
|
||||
return fmt.Errorf("expected two 'in' params, got: %v", ft)
|
||||
}
|
||||
if ft.NumOut() != 1 {
|
||||
return fmt.Errorf("expected one 'out' param, got: %v", ft)
|
||||
|
18
vendor/k8s.io/kubernetes/third_party/forked/shell2junit/sh2ju.sh
generated
vendored
18
vendor/k8s.io/kubernetes/third_party/forked/shell2junit/sh2ju.sh
generated
vendored
@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
### Copyright 2010 Manuel Carrasco Moñino. (manolo at apache.org)
|
||||
###
|
||||
### Licensed under the Apache License, Version 2.0.
|
||||
@ -130,27 +130,19 @@ function juLog() {
|
||||
# calculate vars
|
||||
asserts=$(($asserts+1))
|
||||
errors=$(($errors+$err))
|
||||
time=`echo "${end} - ${ini}" | bc -l`
|
||||
total=`echo "${total} + ${time}" | bc -l`
|
||||
time=`echo "${end} ${ini}" | awk '{print $1 - $2}'`
|
||||
total=`echo "${total} ${time}" | awk '{print $1 + $2}'`
|
||||
|
||||
# write the junit xml report
|
||||
## failure tag
|
||||
[[ ${err} = 0 ]] && failure="" || failure="
|
||||
<failure type=\"ScriptError\" message=\"Script Error\">
|
||||
<![CDATA[
|
||||
${errMsg}
|
||||
]]>
|
||||
</failure>
|
||||
<failure type=\"ScriptError\" message=\"Script Error\"><![CDATA[${errMsg}]]></failure>
|
||||
"
|
||||
## testcase tag
|
||||
content="${content}
|
||||
<testcase assertions=\"1\" name=\"${name}\" time=\"${time}\" classname=\"${class}\">
|
||||
${failure}
|
||||
<system-err>
|
||||
<![CDATA[
|
||||
${errMsg}
|
||||
]]>
|
||||
</system-err>
|
||||
<system-err><![CDATA[${errMsg}]]></system-err>
|
||||
</testcase>
|
||||
"
|
||||
## testsuite block
|
||||
|
Reference in New Issue
Block a user