Skip to content

Commit 3a69715

Browse files
committed
Revert "More accurate windows test changes"
This reverts commit cacdc12.
1 parent cacdc12 commit 3a69715

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

test/jpypetest/test_signals.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,13 @@ def sigterm_handler(sig, frame):
4646
jpype.startJVM(interrupt=False)
4747

4848
def setUp(self):
49+
if sys.platform == "win32":
50+
raise unittest.SkipTest("signals test not applicable on windows")
4951
self.sigint_event.clear()
5052
self.sigterm_event.clear()
5153

5254
def testSigInt(self):
53-
if sys.platform == "win32":
54-
os.kill(os.getpid(), signal.CTRL_C_EVENT)
55-
else:
56-
os.kill(os.getpid(), signal.SIGINT)
55+
os.kill(os.getpid(), signal.SIGINT)
5756

5857
# the test is executed in the main thread. The signal cannot interrupt the threading.Event.wait() call
5958
# so asserting the return value of `wait` does not work.
@@ -64,8 +63,6 @@ def testSigInt(self):
6463
self.assertFalse(self.sigterm_event.is_set())
6564

6665
def testSigTerm(self):
67-
if sys.platform == "win32":
68-
raise unittest.SkipTest("SIGTERM test not applicable on windows")
6966
os.kill(os.getpid(), signal.SIGTERM)
7067

7168
self.sigterm_event.wait(0.1)

0 commit comments

Comments
 (0)