Remove usage of .env in tests

Author: carolineechen

runhouse/resources/hardware/cluster.py

@@ -813,19 +813,19 @@ def put_resource(
             process (str, optional): Process of the object store to put the object in. (Default: ``None``)
         """
         # Logic to get env_name from different ways env can be provided
-        env_name = process or (
+        process = process or (
             resource.process if hasattr(resource, "process") else DEFAULT_PROCESS_NAME
         )
 
         state = state or {}
         if self.on_this_cluster():
             data = (resource.config(condensed=False), state, dryrun)
-            return obj_store.put_resource(serialized_data=data, process=env_name)
+            return obj_store.put_resource(serialized_data=data, process=process)
         return self.call_client_method(
             "put_resource",
             resource,
             state=state or {},
-            process=env_name,
+            process=process,
             dryrun=dryrun,
         )
 

tests/constants.py

@@ -12,3 +12,5 @@
         os.getenv("RH_AUTOSTOP_INTERVAL") or TESTING_AUTOSTOP_INTERVAL
     ),
 }
+
+TEST_REQS = ["pytest", "httpx", "pytest_asyncio", "pandas", "numpy<=1.26.4"]

tests/fixtures/docker_cluster_fixtures.py

@@ -18,7 +18,7 @@
 from tests.conftest import init_args
 
 from tests.constants import TEST_ENV_VARS
-from tests.utils import friend_account, test_env
+from tests.utils import friend_account, setup_test_base
 
 SSH_USER = "rh-docker-user"
 BASE_LOCAL_SSH_PORT = 32320
@@ -278,7 +278,7 @@ def set_up_local_cluster(
     rh_cluster.restart_server(resync_rh=True)
 
     if not rh_cluster.image:
-        test_env(logged_in=logged_in).to(rh_cluster)
+        setup_test_base(rh_cluster, logged_in=logged_in)
 
     def cleanup():
         docker_client.containers.get(container_name).stop()
@@ -353,7 +353,7 @@ def docker_cluster_pk_ssh(request, test_org_rns_folder):
     """This basic cluster fixture is set up with:
     - Public key authentication
     - Caddy set up on startup to forward Runhouse HTTP server to port 443
-    - Default env with Ray 2.30.0
+    - Default image with Ray 2.30.0
     """
     # From pytest config
     detached = request.config.getoption("--detached")
@@ -457,7 +457,7 @@ def docker_cluster_pk_http_exposed(request, test_rns_folder):
     - Public key authentication
     - Den auth disabled (to mimic VPC)
     - Caddy set up on startup to forward Runhouse HTTP Server to port 80
-    - Default conda_env with Python 3.11 and Ray 2.30.0
+    - Default conda image with Python 3.11 and Ray 2.30.0
     """
     # From pytest config
     detached = request.config.getoption("--detached")

tests/fixtures/on_demand_cluster_fixtures.py

@@ -8,8 +8,8 @@
 from runhouse.resources.images.image import Image
 from tests.conftest import init_args
 
-from tests.constants import TEST_ENV_VARS
-from tests.utils import test_env
+from tests.constants import TEST_ENV_VARS, TEST_REQS
+from tests.utils import setup_test_base
 
 NUM_OF_NODES = 2
 
@@ -19,7 +19,7 @@ def restart_server(request):
     return request.config.getoption("--restart-server")
 
 
-def setup_test_cluster(args, request, create_env=False):
+def setup_test_cluster(args, request, setup_base=False):
     cluster = rh.ondemand_cluster(**args)
     init_args[id(cluster)] = args
     cluster.up_if_not()
@@ -28,8 +28,8 @@ def setup_test_cluster(args, request, create_env=False):
 
     cluster.save()
 
-    if create_env or not cluster.image:
-        test_env().to(cluster)
+    if setup_base or not cluster.image:
+        setup_test_base(cluster)
     return cluster
 
 
@@ -52,7 +52,7 @@ def ondemand_cluster(request):
 @pytest.fixture(scope="session")
 def ondemand_aws_docker_cluster(request):
     """
-    Note: Also used to test docker and default env with alternate Ray version.
+    Note: Also used to test docker and default process with alternate Ray version.
     """
     image = (
         Image(name="default_image")
@@ -67,7 +67,7 @@ def ondemand_aws_docker_cluster(request):
         "image": image,
         "sky_kwargs": {"launch": {"retry_until_up": True}},
     }
-    cluster = setup_test_cluster(args, request, create_env=True)
+    cluster = setup_test_cluster(args, request, setup_base=True)
     return cluster
 
 
@@ -99,7 +99,7 @@ def ondemand_gcp_cluster(request):
             conda_env_name="base_env",
             conda_yaml={"dependencies": ["python=3.11"], "name": "base_env"},
         )
-        .install_packages(test_env().reqs + ["ray==2.30.0"], conda_env_name="base_env")
+        .install_packages(TEST_REQS + ["ray==2.30.0"], conda_env_name="base_env")
         .set_env_vars(env_vars=TEST_ENV_VARS)
     )
     args = {
@@ -203,7 +203,7 @@ def multinode_cpu_docker_conda_cluster(request):
             conda_env_name="base_env",
             conda_yaml={"dependencies": ["python=3.11"], "name": "base_env"},
         )
-        .install_packages(test_env().reqs + ["ray==2.30.0"], conda_env_name="base_env")
+        .install_packages(TEST_REQS + ["ray==2.30.0"], conda_env_name="base_env")
     )
     args = {
         "name": "rh-cpu-multinode",

tests/fixtures/static_cluster_fixtures.py

@@ -3,7 +3,7 @@
 import runhouse as rh
 
 from tests.conftest import init_args
-from tests.utils import test_env
+from tests.utils import setup_test_base
 
 
 @pytest.fixture(scope="session")
@@ -44,6 +44,6 @@ def static_cpu_pwd_cluster():
     c.restart_server(resync_rh=True)
     init_args[id(c)] = args
 
-    test_env().to(c)
+    setup_test_base(c)
 
     return c

tests/test_obj_store.py

@@ -151,11 +151,11 @@ def test_pinning_and_arg_replacement(cluster):
     assert pin_fn("put_pin") == "Found in obj store!"
 
 
-def test_put_resource(cluster, test_env):
-    test_env.name = "~/test_env"
-    cluster.put_resource(test_env)
-    assert cluster.call("test_env", "config", stream_logs=True) == test_env.config()
-    assert cluster.get("test_env").config() == test_env.config()
+def test_put_resource(cluster):
+    resource = rh.function(fn=do_printing_and_logging, system=cluster)
+    cluster.put_resource(resource)
+    assert cluster.call(resource.name, "config", stream_logs=True) == resource.config()
+    assert cluster.get(resource.name).config() == resource.config()
 
 
 def serialization_helper_1():

tests/test_resources/test_clusters/cluster_tests.py

@@ -132,9 +132,7 @@ def test_byo_proxy(static_cpu_pwd_cluster, local_folder):
     assert status == 0
     assert stdout == "hi\n"
 
-    summer_func = rh.function(summer, env=rh.env(working_dir="local:./")).to(
-        static_cpu_pwd_cluster
-    )
+    summer_func = rh.function(summer).to(static_cpu_pwd_cluster)
     assert summer_func(1, 2) == 3
 
     static_cpu_pwd_cluster.put("test_obj", list(range(10)))