mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-28 15:53:55 -04:00
tests: Switch from deprecated ConditionVarFull to ConditionVar
This commit is contained in:
parent
8b5fc7d835
commit
a33fcab8da
@ -1,4 +1,4 @@
|
|||||||
from panda3d.core import Mutex, ConditionVarFull
|
from panda3d.core import Mutex, ConditionVar
|
||||||
from panda3d import core
|
from panda3d import core
|
||||||
from direct.stdpy import thread
|
from direct.stdpy import thread
|
||||||
import pytest
|
import pytest
|
||||||
@ -14,7 +14,7 @@ def yield_thread():
|
|||||||
def test_cvar_notify():
|
def test_cvar_notify():
|
||||||
# Just tests that notifying without waiting does no harm.
|
# Just tests that notifying without waiting does no harm.
|
||||||
m = Mutex()
|
m = Mutex()
|
||||||
cv = ConditionVarFull(m)
|
cv = ConditionVar(m)
|
||||||
|
|
||||||
cv.notify()
|
cv.notify()
|
||||||
cv.notify_all()
|
cv.notify_all()
|
||||||
@ -24,7 +24,7 @@ def test_cvar_notify():
|
|||||||
def test_cvar_notify_locked():
|
def test_cvar_notify_locked():
|
||||||
# Tests the same thing, but with the lock held.
|
# Tests the same thing, but with the lock held.
|
||||||
m = Mutex()
|
m = Mutex()
|
||||||
cv = ConditionVarFull(m)
|
cv = ConditionVar(m)
|
||||||
|
|
||||||
with m:
|
with m:
|
||||||
cv.notify()
|
cv.notify()
|
||||||
@ -41,7 +41,7 @@ def test_cvar_notify_locked():
|
|||||||
def test_cvar_notify_thread(num_threads):
|
def test_cvar_notify_thread(num_threads):
|
||||||
# Tests notify() with some number of threads waiting.
|
# Tests notify() with some number of threads waiting.
|
||||||
m = Mutex()
|
m = Mutex()
|
||||||
cv = ConditionVarFull(m)
|
cv = ConditionVar(m)
|
||||||
|
|
||||||
# We prematurely notify, so that we can test that it's not doing anything.
|
# We prematurely notify, so that we can test that it's not doing anything.
|
||||||
m.acquire()
|
m.acquire()
|
||||||
@ -98,7 +98,7 @@ def test_cvar_notify_thread(num_threads):
|
|||||||
def test_cvar_notify_all_threads(num_threads):
|
def test_cvar_notify_all_threads(num_threads):
|
||||||
# Tests notify_all() with some number of threads waiting.
|
# Tests notify_all() with some number of threads waiting.
|
||||||
m = Mutex()
|
m = Mutex()
|
||||||
cv = ConditionVarFull(m)
|
cv = ConditionVar(m)
|
||||||
|
|
||||||
# We prematurely notify, so that we can test that it's not doing anything.
|
# We prematurely notify, so that we can test that it's not doing anything.
|
||||||
m.acquire()
|
m.acquire()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user