Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wendelin.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Joshua
wendelin.core
Commits
d29b0dae
Commit
d29b0dae
authored
Jan 15, 2020
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
8b0ad5b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
wcfs/client/wcfs_watchlink.cpp
wcfs/client/wcfs_watchlink.cpp
+1
-1
wcfs/wcfs_test.py
wcfs/wcfs_test.py
+0
-1
No files found.
wcfs/client/wcfs_watchlink.cpp
View file @
d29b0dae
...
@@ -101,7 +101,7 @@ error _WatchLink::close() {
...
@@ -101,7 +101,7 @@ error _WatchLink::close() {
// XXX -> we now have `kill -QUIT` to wcfs.go on test timeout - remove ^^^ comments?
// XXX -> we now have `kill -QUIT` to wcfs.go on test timeout - remove ^^^ comments?
error
err2
=
wlink
.
_serveWG
->
wait
();
error
err2
=
wlink
.
_serveWG
->
wait
();
// canceled is expected and ok
// canceled is expected and ok
if
(
err2
==
context
::
canceled
)
if
(
err2
==
context
::
canceled
)
// FIXME -> errors.Cause(err2) | errors.Is(err2, context::canceled)
err2
=
nil
;
err2
=
nil
;
error
err3
=
wlink
.
_f
->
close
();
error
err3
=
wlink
.
_f
->
close
();
...
...
wcfs/wcfs_test.py
View file @
d29b0dae
...
@@ -950,7 +950,6 @@ def doCheckingPin(f, pinokByWLink, pinfunc=None): # -> []event(str)
...
@@ -950,7 +950,6 @@ def doCheckingPin(f, pinokByWLink, pinfunc=None): # -> []event(str)
except
Exception
as
e
:
except
Exception
as
e
:
if
e
is
context
.
canceled
:
if
e
is
context
.
canceled
:
return
# cancel is expected after f completes
return
# cancel is expected after f completes
#reraise(e, None, e.__traceback__)
raise
raise
fail
(
"extra pin message received: %r"
%
req
.
msg
)
fail
(
"extra pin message received: %r"
%
req
.
msg
)
...
...
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