Merge branch 'mainline' into update_deadline

aws-deadline · Nov 19, 2024 · f90ec28 · f90ec28
2 parents 9058493 + 193c640
commit f90ec28
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/test/e2e/test_override_job_user.py b/test/e2e/test_override_job_user.py
@@ -318,9 +318,6 @@ def test_no_user_override(
 
         assert job.task_run_status == TaskStatus.SUCCEEDED
 
-    @pytest.mark.skip(
-        reason="Passes consistently on local but fails in Github. Will re-enable after investigation"
-    )
     def test_config_file_user_override(
         self,
         deadline_resources,
@@ -384,9 +381,6 @@ def check_worker_service_stopped() -> None:
                 cmd_result.exit_code == 0
             ), f"Resetting the job user override via CLI failed: {cmd_result}"
 
-    @pytest.mark.skip(
-        reason="Passes consistently on local but fails in Github. Will re-enable after investigation"
-    )
     def test_env_var_user_override(
         self,
         deadline_resources,