Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a7f52b27
Unverified
Commit
a7f52b27
authored
Jan 25, 2017
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add test shell stack traces
parent
d47f8985
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
9 deletions
+27
-9
logging.sh
cluster/lib/logging.sh
+10
-1
test.sh
hack/lib/test.sh
+17
-8
No files found.
cluster/lib/logging.sh
View file @
a7f52b27
...
...
@@ -28,7 +28,16 @@ kube::log::errexit() {
set
+o xtrace
local
code
=
"
${
1
:-
1
}
"
kube::log::error_exit
"'
${
BASH_COMMAND
}
' exited with status
$err
"
"
${
1
:-
1
}
"
1
# Print out the stack trace described by $function_stack
if
[
${#
FUNCNAME
[@]
}
-gt
2
]
then
kube::log::error
"Call tree:"
for
((
i
=
1
;
i<
${#
FUNCNAME
[@]
}
-1
;
i++
))
do
kube::log::error
"
$i
:
${
BASH_SOURCE
[
$i
+1]
}
:
${
BASH_LINENO
[
$i
]
}
${
FUNCNAME
[
$i
]
}
(...)"
done
fi
kube::log::error_exit
"Error in
${
BASH_SOURCE
[1]
}
:
${
BASH_LINENO
[0]
}
. '
${
BASH_COMMAND
}
' exited with status
$err
"
"
${
1
:-
1
}
"
1
}
kube::log::install_errexit
()
{
...
...
hack/lib/test.sh
View file @
a7f52b27
...
...
@@ -31,6 +31,15 @@ kube::test::clear_all() {
fi
}
# Prints the calling file and line number $1 levels deep
# Defaults to 2 levels so you can call this to find your own caller
kube::test::get_caller
()
{
local
levels
=
${
1
:-
2
}
local
caller_file
=
"
${
BASH_SOURCE
[
$levels
]
}
"
local
caller_line
=
"
${
BASH_LINENO
[
$levels
-1]
}
"
echo
"
$(
basename
"
${
caller_file
}
"
)
:
${
caller_line
}
"
}
# Force exact match of a returned result for a object query. Wrap this with || to support multiple
# valid return types.
kube::test::get_object_assert
()
{
...
...
@@ -43,12 +52,12 @@ kube::test::get_object_assert() {
if
[[
"
$res
"
=
~ ^
$expected$
]]
;
then
echo
-n
${
green
}
echo
"Successful get
$object
$request
:
$res
"
echo
"
$(
kube::test::get_caller
)
:
Successful get
$object
$request
:
$res
"
echo
-n
${
reset
}
return
0
else
echo
${
bold
}${
red
}
echo
"FAIL!"
echo
"
$(
kube::test::get_caller
)
:
FAIL!"
echo
"Get
$object
$request
"
echo
" Expected:
$expected
"
echo
" Got:
$res
"
...
...
@@ -68,12 +77,12 @@ kube::test::get_object_jsonpath_assert() {
if
[[
"
$res
"
=
~ ^
$expected$
]]
;
then
echo
-n
${
green
}
echo
"Successful get
$object
$request
:
$res
"
echo
"
$(
kube::test::get_caller
)
:
Successful get
$object
$request
:
$res
"
echo
-n
${
reset
}
return
0
else
echo
${
bold
}${
red
}
echo
"FAIL!"
echo
"
$(
kube::test::get_caller
)
:
FAIL!"
echo
"Get
$object
$request
"
echo
" Expected:
$expected
"
echo
" Got:
$res
"
...
...
@@ -94,7 +103,7 @@ kube::test::describe_object_assert() {
for
match
in
${
matches
}
;
do
if
[[
!
$(
echo
"
$result
"
|
grep
${
match
})
]]
;
then
echo
${
bold
}${
red
}
echo
"FAIL!"
echo
"
$(
kube::test::get_caller
)
:
FAIL!"
echo
"Describe
$resource
$object
"
echo
" Expected Match:
$match
"
echo
" Not found in:"
...
...
@@ -107,7 +116,7 @@ kube::test::describe_object_assert() {
done
echo
-n
${
green
}
echo
"Successful describe
$resource
$object
:"
echo
"
$(
kube::test::get_caller
)
:
Successful describe
$resource
$object
:"
echo
"
$result
"
echo
-n
${
reset
}
return
0
...
...
@@ -131,13 +140,13 @@ kube::test::describe_object_events_assert() {
fi
if
[[
$showevents
==
$has_events
]]
;
then
echo
-n
${
green
}
echo
"Successful describe"
echo
"
$(
kube::test::get_caller
)
:
Successful describe"
echo
"
$result
"
echo
${
reset
}
return
0
else
echo
${
bold
}${
red
}
echo
"FAIL"
echo
"
$(
kube::test::get_caller
)
:
FAIL"
if
[[
$showevents
==
"false"
]]
;
then
echo
" Events information should not be described in:"
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment