update: tests

Author: VanillaSpoon

tests/e2e/mnist_raycluster_sdk_oauth_test.py

@@ -2,8 +2,6 @@
 
 from time import sleep
 
-from torchx.specs.api import AppState, is_terminal
-
 from codeflare_sdk import Cluster, ClusterConfiguration, TokenAuthentication
 from codeflare_sdk.job import RayJobClient
 
@@ -78,7 +76,7 @@ def assert_jobsubmit_withoutLogin(self, cluster):
             "entrypoint": "python mnist.py",
             "runtime_env": {
                 "working_dir": "./tests/e2e/",
-                "pip": "mnist_pip_requirements.txt",
+                "pip": "./tests/e2e/mnist_pip_requirements.txt",
             },
         }
         try:
@@ -116,7 +114,7 @@ def assert_jobsubmit_withlogin(self, cluster):
         timeout = 900
         while not done:
             status = client.get_job_status(submission_id)
-            if is_terminal(status.state):
+            if status.is_terminal():
                 break
             if not done:
                 print(status)
@@ -151,9 +149,9 @@ def assert_appwrapper_exists(self):
             assert False
 
     def assert_job_completion(self, status):
-        if status.state == AppState.SUCCEEDED:
-            print(f"Job has completed: '{status.state}'")
+        if status == "SUCCEEDED":
+            print(f"Job has completed: '{status}'")
             assert True
         else:
-            print(f"Job has completed: '{status.state}'")
+            print(f"Job has completed: '{status}'")
             assert False

tests/e2e/mnist_raycluster_sdk_test.py

@@ -7,8 +7,6 @@
 
 import ray
 
-from torchx.specs.api import AppState, is_terminal
-
 from codeflare_sdk.cluster.cluster import Cluster, ClusterConfiguration
 from codeflare_sdk.job import RayJobClient
 
@@ -69,7 +67,6 @@ def run_mnist_raycluster_sdk(self):
                 num_gpus=0,
                 instascale=False,
                 image=ray_image,
-                ingress_domain="apps.cluster.awsroute.org",
                 ingress_options=ingress_options,
                 write_to_file=True,
             )
@@ -97,7 +94,7 @@ def run_mnist_raycluster_sdk(self):
             entrypoint="python mnist.py",
             runtime_env={
                 "working_dir": "./tests/e2e/",
-                "pip": "mnist_pip_requirements.txt",
+                "pip": "./tests/e2e/mnist_pip_requirements.txt",
             },
         )
         print(f"Submitted job with ID: {submission_id}")
@@ -106,7 +103,7 @@ def run_mnist_raycluster_sdk(self):
         timeout = 900
         while not done:
             status = client.get_job_status(submission_id)
-            if is_terminal(status.state):
+            if status.is_terminal():
                 break
             if not done:
                 print(status)
@@ -155,9 +152,9 @@ def assert_raycluster_exists(self):
             assert False
 
     def assert_job_completion(self, status):
-        if status.state == AppState.SUCCEEDED:
-            print(f"Job has completed: '{status.state}'")
+        if status == "SUCCEEDED":
+            print(f"Job has completed: '{status}'")
             assert True
         else:
-            print(f"Job has completed: '{status.state}'")
+            print(f"Job has completed: '{status}'")
             assert False

tests/e2e/mnist_rayjob.py

@@ -2,8 +2,6 @@
 
 from time import sleep
 
-from torchx.specs.api import AppState, is_terminal
-
 from support import *
 
 from codeflare_sdk.cluster.cluster import get_cluster
@@ -31,7 +29,7 @@
 timeout = 900
 while not done:
     status = client.get_job_status(submission_id)
-    if is_terminal(status.state):
+    if status.is_terminal():
         break
     if not done:
         print(status)
@@ -47,7 +45,7 @@
 cluster.down()
 
 
-if not status.state == AppState.SUCCEEDED:
+if not status == "SUCCEEDED":
     exit(1)
 else:
     exit(0)