Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
should
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vidjil
should
Commits
60ddda47
Commit
60ddda47
authored
Jun 01, 2020
by
Mathieu Giraud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demo/exit-code.should, src/should.py: test non-zero exit codes
closes
#31
parent
061eb38d
Pipeline
#2676
passed with stages
in 15 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
demo/exit-code.should
demo/exit-code.should
+5
-0
src/should.py
src/should.py
+8
-3
No files found.
demo/exit-code.should
View file @
60ddda47
...
...
@@ -2,9 +2,14 @@
# Other exit codes can be given
# The files differ
$ Exit code is exactly '1'
!EXIT_CODE: 1
diff demo/hello.should demo/cal.should
$ Exit code is not zero
!EXIT_CODE: +
diff demo/hello.should demo/cal.should
$ 'world' is in the diff
: world
...
...
src/should.py
View file @
60ddda47
...
...
@@ -817,7 +817,8 @@ class TestSuite():
# Directive -- Exit code
if
l
.
startswith
(
DIRECTIVE_EXIT_CODE
):
self
.
expected_exit_code
=
int
(
l
[
len
(
DIRECTIVE_EXIT_CODE
):].
strip
())
e
=
l
[
len
(
DIRECTIVE_EXIT_CODE
):].
strip
()
self
.
expected_exit_code
=
NOT_ZERO
if
e
==
NOT_ZERO
else
int
(
e
)
continue
# Name
...
...
@@ -904,11 +905,15 @@ class TestSuite():
stdout
=
f_stdout
,
stderr
=
f_stderr
,
close_fds
=
True
)
exit_code_message
=
'Exit code is %
d
-- %s'
%
(
self
.
expected_exit_code
,
cmd
)
exit_code_message
=
'Exit code is %
s
-- %s'
%
(
self
.
expected_exit_code
,
cmd
)
try
:
self
.
exit_code
=
p
.
wait
(
self
.
timeout
)
exit_test
=
ExternalTestCase
(
exit_code_message
,
self
.
exit_code
==
self
.
expected_exit_code
,
str
(
self
.
exit_code
))
if
self
.
expected_exit_code
==
NOT_ZERO
:
success
=
(
self
.
exit_code
>
0
)
else
:
success
=
(
self
.
exit_code
==
self
.
expected_exit_code
)
exit_test
=
ExternalTestCase
(
exit_code_message
,
success
,
str
(
self
.
exit_code
))
except
subprocess
.
TimeoutExpired
:
self
.
exit_code
=
None
exit_test
=
ExternalTestCase
(
exit_code_message
,
S_SKIP
,
'timeout after %s seconds'
%
self
.
timeout
)
...
...
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