Skip to content

Commit f21e21c

Browse files
committed
Revert "Drop deprecation warnings"
This reverts commit d8e320a. Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
1 parent 0a817c1 commit f21e21c

File tree

2 files changed

+56
-30
lines changed

2 files changed

+56
-30
lines changed

launch/launch/utilities/signal_management.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
from typing import Optional
2626
from typing import Tuple # noqa: F401
2727
from typing import Union
28+
import warnings
2829

2930
import osrf_pycommon.process_utils
3031

@@ -261,6 +262,11 @@ def on_sigint(handler):
261262
262263
Use AsyncSafeSignalManager instead
263264
"""
265+
warnings.warn(
266+
'Global signal management APIs are deprecated. Do not use on_sigint(). '
267+
'Use the AsyngSafeSignalManager instead.',
268+
DeprecationWarning
269+
)
264270
__global_signal_manager.handle(signal.SIGINT, handler)
265271

266272

@@ -279,6 +285,11 @@ def on_sigquit(handler):
279285
280286
Use AsyncSafeSignalManager instead
281287
"""
288+
warnings.warn(
289+
'Global signal management APIs are deprecated. Do not use on_sigquit(). '
290+
'Use the AsyngSafeSignalManager instead.',
291+
DeprecationWarning
292+
)
282293
if platform.system() != 'Windows':
283294
__global_signal_manager.handle(signal.SIGQUIT, handler)
284295

@@ -295,6 +306,11 @@ def on_sigterm(handler):
295306
296307
Use AsyncSafeSignalManager instead
297308
"""
309+
warnings.warn(
310+
'Global signal management APIs are deprecated. Do not use on_sigterm(). '
311+
'Use the AsyngSafeSignalManager instead.',
312+
DeprecationWarning
313+
)
298314
__global_signal_manager.handle(signal.SIGTERM, handler)
299315

300316

@@ -324,4 +340,10 @@ def install_signal_handlers():
324340
if __global_signal_manager_activated:
325341
return
326342
__global_signal_manager_activated = True
343+
warnings.warn(
344+
'Global signal management APIs are deprecated. '
345+
'Do not use install_signal_handlers(). '
346+
'Use the AsyngSafeSignalManager instead.',
347+
DeprecationWarning
348+
)
327349
__global_signal_manager.__enter__()

launch/test/launch/utilities/test_signal_management.py

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -123,59 +123,63 @@ def test_async_safe_signal_manager():
123123

124124
def test_install_signal_handlers():
125125
"""Test the install_signal_handlers() function."""
126-
install_signal_handlers()
127-
install_signal_handlers()
128-
install_signal_handlers()
126+
with pytest.deprecated_call():
127+
install_signal_handlers()
128+
install_signal_handlers()
129+
install_signal_handlers()
129130

130131

131132
def test_on_sigint():
132133
"""Test the on_sigint() function."""
133-
# None is acceptable
134-
on_sigint(None)
134+
with pytest.deprecated_call():
135+
# None is acceptable
136+
on_sigint(None)
135137

136-
def mock_sigint_handler():
137-
pass
138+
def mock_sigint_handler():
139+
pass
138140

139-
on_sigint(mock_sigint_handler)
141+
on_sigint(mock_sigint_handler)
140142

141-
# Non-callable is not
142-
with pytest.raises(ValueError):
143-
on_sigint('non-callable')
143+
# Non-callable is not
144+
with pytest.raises(ValueError):
145+
on_sigint('non-callable')
144146

145-
# TODO(jacobperron): implement a functional test by using subprocess.Popen
147+
# TODO(jacobperron): implement a functional test by using subprocess.Popen
146148

147149

148150
@pytest.mark.skipif(platform.system() == 'Windows',
149151
reason='No SIGQUIT on Windows')
150152
def test_on_sigquit():
151153
"""Test the on_sigquit() function."""
152-
# None is acceptable
153-
on_sigquit(None)
154+
with pytest.deprecated_call():
155+
# None is acceptable
156+
on_sigquit(None)
154157

155-
def mock_sigquit_handler():
156-
pass
158+
def mock_sigquit_handler():
159+
pass
157160

158-
on_sigquit(mock_sigquit_handler)
161+
on_sigquit(mock_sigquit_handler)
159162

160-
# Non-callable is not
161-
with pytest.raises(ValueError):
162-
on_sigquit('non-callable')
163+
# Non-callable is not
164+
with pytest.raises(ValueError):
165+
on_sigquit('non-callable')
163166

164-
# TODO(jacobperron): implement a functional test by using subprocess.Popen
167+
# TODO(jacobperron): implement a functional test by using subprocess.Popen
165168

166169

167170
def test_on_sigterm():
168171
"""Test the on_sigterm() function."""
169-
# None is acceptable
170-
on_sigterm(None)
172+
with pytest.deprecated_call():
173+
# None is acceptable
174+
on_sigterm(None)
171175

172-
def mock_sigterm_handler():
173-
pass
176+
def mock_sigterm_handler():
177+
pass
174178

175-
on_sigterm(mock_sigterm_handler)
179+
on_sigterm(mock_sigterm_handler)
176180

177-
# Non-callable is not
178-
with pytest.raises(ValueError):
179-
on_sigterm('non-callable')
181+
# Non-callable is not
182+
with pytest.raises(ValueError):
183+
on_sigterm('non-callable')
180184

181-
# TODO(jacobperron): implement a functional test by using subprocess.Popen
185+
# TODO(jacobperron): implement a functional test by using subprocess.Popen

0 commit comments

Comments
 (0)