V2.4.2

Changelog.md

@@ -1,6 +1,9 @@
 # CHANGELOG
 All notable changes to this project will be documented here.
 
+## [v2.4.2]
+- Ensure _env_status is updated to "setup" earlier when a request to update test settings is made (#499)
+
 ## [v2.4.1]
 - Fix bug that prevented copies of instructor directories from being deleted (#483)
 - Add STACK_ROOT to containers as well as notes in readme (#484)

client/autotest_client/__init__.py

@@ -2,6 +2,7 @@
 from werkzeug.exceptions import HTTPException
 import os
 import sys
+import time
 import rq
 import json
 import io
@@ -108,6 +109,11 @@ def _update_settings(settings_id, user):
     if error:
         abort(make_response(jsonify(message=error), 422))
 
+    test_settings["_user"] = user
+    test_settings["_last_access"] = int(time.time())
+    test_settings["_env_status"] = "setup"
+    REDIS_CONNECTION.hset("autotest:settings", key=settings_id, value=json.dumps(test_settings))
+
     queue = rq.Queue("settings", connection=REDIS_CONNECTION)
     data = {"user": user, "settings_id": settings_id, "test_settings": test_settings, "file_url": file_url}
     queue.enqueue_call(
@@ -198,7 +204,9 @@ def settings(settings_id, **_kw):
 @authorize
 def create_settings(user):
     settings_id = REDIS_CONNECTION.incr("autotest:settings_id")
-    REDIS_CONNECTION.hset("autotest:settings", key=settings_id, value=json.dumps({"_user": user}))
+    REDIS_CONNECTION.hset(
+        "autotest:settings", key=settings_id, value=json.dumps({"_user": user, "_env_status": "setup"})
+    )
     _update_settings(settings_id, user)
     return {"settings_id": settings_id}
 

server/autotest_server/__init__.py

@@ -218,6 +218,7 @@ def _run_test_specs(
                         preexec_fn=set_rlimits_before_test,
                         universal_newlines=True,
                         env={**os.environ, **env_vars, **env},
+                        executable="/bin/bash",
                     )
                     try:
                         settings_json = json.dumps({**settings, "test_data": test_data})
@@ -254,10 +255,13 @@ def _clear_working_directory(tests_path: str, test_username: str) -> None:
     Run commands that clear the tests_path working directory
     """
     if test_username != getpass.getuser():
-        chmod_cmd = f"sudo -u {test_username} -- bash -c 'chmod -Rf -t ugo+rwX {tests_path}'"
+        sticky_cmd = f"sudo -u {test_username} -- bash -c 'chmod -Rf -t {tests_path}'"
+        chmod_cmd = f"sudo -u {test_username} -- bash -c 'chmod -Rf ugo+rwX {tests_path}'"
     else:
-        chmod_cmd = f"chmod -Rf -t ugo+rwX {tests_path}"
+        sticky_cmd = f"chmod -Rf -t {tests_path}"
+        chmod_cmd = f"chmod -Rf ugo+rwX {tests_path}"
 
+    subprocess.run(sticky_cmd, shell=True)
     subprocess.run(chmod_cmd, shell=True)
 
     # be careful not to remove the tests_path dir itself since we have to
@@ -366,11 +370,6 @@ def ignore_missing_dir_error(
 
 
 def update_test_settings(user, settings_id, test_settings, file_url):
-    test_settings["_user"] = user
-    test_settings["_last_access"] = int(time.time())
-    test_settings["_env_status"] = "setup"
-    redis_connection().hset("autotest:settings", key=settings_id, value=json.dumps(test_settings))
-
     try:
         settings_dir = os.path.join(TEST_SCRIPT_DIR, str(settings_id))