mirror of
https://github.com/wassname/ray.git
synced 2026-07-13 08:10:21 +08:00
Convert asserts in unittest to pytest (#2529)
This commit is contained in:
committed by
Robert Nishihara
parent
9ea57c2a93
commit
d8ba667175
+17
-16
@@ -9,6 +9,7 @@ import unittest
|
||||
|
||||
import ray
|
||||
from ray.test.test_utils import run_and_get_output
|
||||
import pytest
|
||||
|
||||
|
||||
def run_string_as_driver(driver_script):
|
||||
@@ -49,7 +50,7 @@ class MultiNodeTest(unittest.TestCase):
|
||||
ray.init(redis_address=self.redis_address, driver_mode=ray.SILENT_MODE)
|
||||
|
||||
# There shouldn't be any errors yet.
|
||||
self.assertEqual(len(ray.error_info()), 0)
|
||||
assert len(ray.error_info()) == 0
|
||||
|
||||
error_string1 = "error_string1"
|
||||
error_string2 = "error_string2"
|
||||
@@ -59,7 +60,7 @@ class MultiNodeTest(unittest.TestCase):
|
||||
raise Exception(error_string1)
|
||||
|
||||
# Run a remote function that throws an error.
|
||||
with self.assertRaises(Exception):
|
||||
with pytest.raises(Exception):
|
||||
ray.get(f.remote())
|
||||
|
||||
# Wait for the error to appear in Redis.
|
||||
@@ -68,8 +69,8 @@ class MultiNodeTest(unittest.TestCase):
|
||||
print("Waiting for error to appear.")
|
||||
|
||||
# Make sure we got the error.
|
||||
self.assertEqual(len(ray.error_info()), 1)
|
||||
self.assertIn(error_string1, ray.error_info()[0]["message"])
|
||||
assert len(ray.error_info()) == 1
|
||||
assert error_string1 in ray.error_info()[0]["message"]
|
||||
|
||||
# Start another driver and make sure that it does not receive this
|
||||
# error. Make the other driver throw an error, and make sure it
|
||||
@@ -104,12 +105,12 @@ print("success")
|
||||
|
||||
out = run_string_as_driver(driver_script)
|
||||
# Make sure the other driver succeeded.
|
||||
self.assertIn("success", out)
|
||||
assert "success" in out
|
||||
|
||||
# Make sure that the other error message doesn't show up for this
|
||||
# driver.
|
||||
self.assertEqual(len(ray.error_info()), 1)
|
||||
self.assertIn(error_string1, ray.error_info()[0]["message"])
|
||||
assert len(ray.error_info()) == 1
|
||||
assert error_string1 in ray.error_info()[0]["message"]
|
||||
|
||||
def testRemoteFunctionIsolation(self):
|
||||
# This test will run multiple remote functions with the same names in
|
||||
@@ -146,10 +147,10 @@ print("success")
|
||||
|
||||
for _ in range(10000):
|
||||
result = ray.get([f.remote(), g.remote(0)])
|
||||
self.assertEqual(result, [1, 2])
|
||||
assert result == [1, 2]
|
||||
|
||||
# Make sure the other driver succeeded.
|
||||
self.assertIn("success", out)
|
||||
assert "success" in out
|
||||
|
||||
@unittest.skipIf(
|
||||
os.environ.get("RAY_USE_XRAY") == "1",
|
||||
@@ -187,11 +188,11 @@ print("success")
|
||||
for _ in range(3):
|
||||
out = run_string_as_driver(driver_script1)
|
||||
# Make sure the first driver ran to completion.
|
||||
self.assertIn("success", out)
|
||||
assert "success" in out
|
||||
out = run_string_as_driver(driver_script2)
|
||||
# Make sure the first driver ran to completion.
|
||||
self.assertIn("success", out)
|
||||
self.assertTrue(ray.services.all_processes_alive())
|
||||
assert "success" in out
|
||||
assert ray.services.all_processes_alive()
|
||||
|
||||
|
||||
class StartRayScriptTest(unittest.TestCase):
|
||||
@@ -254,7 +255,7 @@ class StartRayScriptTest(unittest.TestCase):
|
||||
subprocess.Popen(["ray", "stop"]).wait()
|
||||
|
||||
# Test starting Ray with invalid arguments.
|
||||
with self.assertRaises(Exception):
|
||||
with pytest.raises(Exception):
|
||||
run_and_get_output([
|
||||
"ray", "start", "--head", "--redis-address", "127.0.0.1:6379"
|
||||
])
|
||||
@@ -273,7 +274,7 @@ class StartRayScriptTest(unittest.TestCase):
|
||||
def f():
|
||||
return 1
|
||||
|
||||
self.assertEqual(ray.get(f.remote()), 1)
|
||||
assert ray.get(f.remote()) == 1
|
||||
|
||||
# Kill the Ray cluster.
|
||||
subprocess.Popen(["ray", "stop"]).wait()
|
||||
@@ -295,7 +296,7 @@ print("success")
|
||||
|
||||
out = run_string_as_driver(driver_script)
|
||||
# Make sure the other driver succeeded.
|
||||
self.assertIn("success", out)
|
||||
assert "success" in out
|
||||
|
||||
|
||||
class RunDriverForMultipleTimesTest(unittest.TestCase):
|
||||
@@ -342,7 +343,7 @@ print("success")
|
||||
|
||||
for i in range(2):
|
||||
out = run_string_as_driver(driver_script)
|
||||
self.assertIn("success", out)
|
||||
assert "success" in out
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user