Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
margo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
17
Issues
17
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
sds
margo
Commits
8f775834
Commit
8f775834
authored
Apr 27, 2016
by
Philip Carns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make check test for timeout
parent
ce603b6b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
91 additions
and
3 deletions
+91
-3
tests/Makefile.subdir
tests/Makefile.subdir
+9
-3
tests/test-util-hang.sh
tests/test-util-hang.sh
+40
-0
tests/timeout.sh
tests/timeout.sh
+42
-0
No files found.
tests/Makefile.subdir
View file @
8f775834
check_PROGRAMS
+=
\
examples/sleep
\
examples/server
\
examples/client
examples/client
\
examples/server-hang
\
examples/client-timeout
TESTS
+=
\
tests/sleep.sh
\
tests/basic.sh
tests/basic.sh
\
tests/timeout.sh
EXTRA_DIST
+=
\
tests/sleep.sh
\
tests/basic.sh
tests/basic.sh
\
tests/timeout.sh
\
tests/test-util.sh
\
tests/test-util-hang.sh
tests/test-util-hang.sh
0 → 100644
View file @
8f775834
#
# General test script utilities
#
function
run_to
()
{
maxtime
=
${
1
}
s
shift
timeout
--signal
=
9
$maxtime
"
$@
"
}
function
test_start_servers
()
{
nservers
=
${
1
:-
4
}
startwait
=
${
2
:-
15
}
maxtime
=
${
3
:-
120
}
s
repfactor
=
${
4
:-
0
}
pid
=
$$
startport
=
3344
endport
=
`
expr
3344 +
$nservers
- 1
`
# start daemons
for
i
in
`
seq
$startport
$endport
`
do
timeout
--signal
=
9
${
maxtime
}
examples/server-hang tcp://localhost:
$i
&
if
[
$?
-ne
0
]
;
then
# TODO: this doesn't actually work; can't check return code of
# something executing in background. We have to rely on the
# return codes of the actual client side tests to tell if
# everything started properly
exit
1
fi
done
# wait for servers to start
sleep
${
startwait
}
svr1
=
"tcp://localhost:
$startport
"
}
tests/timeout.sh
0 → 100755
View file @
8f775834
#!/bin/bash -x
if
[
-z
$srcdir
]
;
then
echo
srcdir variable not set.
exit
1
fi
source
$srcdir
/tests/test-util-hang.sh
TMPOUT
=
$(
mktemp
--tmpdir
test-XXXXXX
)
# start 1 server with 2 second wait, 8s timeout
test_start_servers 1 2 8
sleep
1
#####################
# run client test
run_to 10 examples/client-timeout
$svr1
&>
$TMPOUT
if
[
$?
-ne
0
]
;
then
wait
exit
1
fi
# check output; look for four "returned 9" to indicate HG_CANCELED in the four
# concurrent RPCs
LINECOUNT
=
$(
grep
"returned 9"
$TMPOUT
|
wc
-l
)
if
[
$LINECOUNT
-ne
4]
;
then
exit
1
fi
#####################
# note that this test leaves the server running; it will be killed after the
# 8s timeout from test_start_servers
wait
echo
cleaning up
$TMPBASE
rm
-rf
$TMPBASE
exit
0
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