Update unit tests to remove supervisorctl references

- Remove ProcessMonitor tests as the class has been removed
- Update test expectations to not check for supervisorctl config sections
- Fix mock setup for process returncode
- All 77 unit tests passing

Author: HappyAmazonian

PR_DESCRIPTION.md

@@ -54,7 +54,7 @@ ENTRYPOINT ["standard-supervisor", "./sagemaker-entrypoint.sh"]
 standard-supervisor vllm serve model --host 0.0.0.0 --port 8080
 
 # With custom configuration
-PROCESS_MAX_START_RETRIES=5 SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS=30 \
+PROCESS_MAX_START_RETRIES=5 SUPERVISOR_PROGRAM__APP_STARTSECS=30 \
 standard-supervisor python -m tensorrt_llm.hlapi.llm_api
 ```
 
@@ -67,8 +67,8 @@ RUN pip install model-hosting-container-standards
 
 # Configure your ML framework with supervisor settings
 ENV PROCESS_MAX_START_RETRIES=3
-ENV SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS=30
-ENV SUPERVISOR_PROGRAM__LLM_ENGINE_STOPWAITSECS=60
+ENV SUPERVISOR_PROGRAM__APP_STARTSECS=30
+ENV SUPERVISOR_PROGRAM__APP_STOPWAITSECS=60
 ENV LOG_LEVEL=info
 
 # Use supervisor for process management
@@ -84,10 +84,10 @@ CMD ["vllm", "serve", "model", "--host", "0.0.0.0", "--port", "8080"]
 - `LOG_LEVEL=info` - Logging level (debug, info, warn, error, critical)
 
 **Advanced Supervisor Settings:**
-- `SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS=30` - Time process must run to be considered "started"
-- `SUPERVISOR_PROGRAM__LLM_ENGINE_STOPWAITSECS=60` - Time to wait for graceful shutdown
-- `SUPERVISOR_PROGRAM__LLM_ENGINE_AUTORESTART=true` - Enable automatic restart on failure
-- `SUPERVISOR_PROGRAM__LLM_ENGINE_STARTRETRIES=3` - Startup retry attempts
+- `SUPERVISOR_PROGRAM__APP_STARTSECS=30` - Time process must run to be considered "started"
+- `SUPERVISOR_PROGRAM__APP_STOPWAITSECS=60` - Time to wait for graceful shutdown
+- `SUPERVISOR_PROGRAM__APP_AUTORESTART=true` - Enable automatic restart on failure
+- `SUPERVISOR_PROGRAM__APP_STARTRETRIES=3` - Startup retry attempts
 - `SUPERVISOR_CONFIG_PATH=/tmp/supervisord.conf` - Custom config file location
 
 **Custom Sections:**

python/model_hosting_container_standards/supervisor/README.md

@@ -63,17 +63,17 @@ export LOG_LEVEL=info                               # Log level (default: info,
 Use the pattern `SUPERVISOR_{SECTION}_{KEY}=VALUE` for advanced supervisord customization:
 
 **Important**:
-- The default program name is `llm_engine`
+- The default program name is `app`
 - To target specific programs, use double underscores `__` to represent colons in section names
-- Program names in environment variables use the same format (e.g., `LLM_ENGINE` for `llm_engine`)
+- Program names in environment variables use the same format (e.g., `APP` for `app`)
 
 ```bash
-# Program section overrides (for default program "llm_engine")
-export SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS=10              # Seconds to wait before considering started (default: 1)
-export SUPERVISOR_PROGRAM__LLM_ENGINE_STOPWAITSECS=30           # Seconds to wait for graceful shutdown (default: 10)
-export SUPERVISOR_PROGRAM__LLM_ENGINE_AUTORESTART=unexpected    # Advanced restart control (true/false/unexpected)
+# Program section overrides (for default program "app")
+export SUPERVISOR_PROGRAM__APP_STARTSECS=10              # Seconds to wait before considering started (default: 1)
+export SUPERVISOR_PROGRAM__APP_STOPWAITSECS=30           # Seconds to wait for graceful shutdown (default: 10)
+export SUPERVISOR_PROGRAM__APP_AUTORESTART=unexpected    # Advanced restart control (true/false/unexpected)
 
-# For program-specific overrides, use the program name (default: "llm_engine")
+# For program-specific overrides, use the program name (default: "app")
 # Or use application-level variables like PROCESS_MAX_START_RETRIES for simpler configuration
 
 # Supervisord daemon configuration
@@ -89,17 +89,17 @@ export SUPERVISOR_UNIX_HTTP_SERVER_FILE=/tmp/supervisor.sock  # Socket file loca
 ```bash
 # High availability setup with more retries (recommended approach)
 export PROCESS_MAX_START_RETRIES=10
-export SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS=30
-export SUPERVISOR_PROGRAM__LLM_ENGINE_STARTRETRIES=10
+export SUPERVISOR_PROGRAM__APP_STARTSECS=30
+export SUPERVISOR_PROGRAM__APP_STARTRETRIES=10
 
 # Debug mode with verbose logging
 export LOG_LEVEL=debug
 export SUPERVISOR_SUPERVISORD_LOGLEVEL=debug
 
 # Quick restart for development
-export SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS=1
-export SUPERVISOR_PROGRAM__LLM_ENGINE_STOPWAITSECS=5
-export SUPERVISOR_PROGRAM__LLM_ENGINE_STARTRETRIES=1
+export SUPERVISOR_PROGRAM__APP_STARTSECS=1
+export SUPERVISOR_PROGRAM__APP_STOPWAITSECS=5
+export SUPERVISOR_PROGRAM__APP_STARTRETRIES=1
 
 # Disable auto-recovery for debugging
 export PROCESS_AUTO_RECOVERY=false
@@ -129,8 +129,8 @@ docker run \
 
 # Advanced: Direct supervisord configuration override
 docker run \
-  -e SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS=30 \
-  -e SUPERVISOR_PROGRAM__LLM_ENGINE_STARTRETRIES=5 \
+  -e SUPERVISOR_PROGRAM__APP_STARTSECS=30 \
+  -e SUPERVISOR_PROGRAM__APP_STARTRETRIES=5 \
   -e SUPERVISOR_SUPERVISORD_LOGLEVEL=debug \
   my-image
 ```
@@ -169,8 +169,8 @@ RUN pip install model-hosting-container-standards
 # Configure supervisor behavior (recommended approach)
 ENV PROCESS_MAX_START_RETRIES=5
 ENV LOG_LEVEL=debug
-ENV SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS=30
-ENV SUPERVISOR_PROGRAM__LLM_ENGINE_STARTRETRIES=5
+ENV SUPERVISOR_PROGRAM__APP_STARTSECS=30
+ENV SUPERVISOR_PROGRAM__APP_STARTRETRIES=5
 
 # Use standard-supervisor with custom configuration
 CMD ["standard-supervisor", "vllm", "serve", "model", "--host", "0.0.0.0", "--port", "8080"]
@@ -251,7 +251,7 @@ export PROCESS_MAX_START_RETRIES=1
 ```bash
 # Fix: Use recommended application-level variables first
 # Recommended: PROCESS_MAX_START_RETRIES=5
-# Advanced (specific program): SUPERVISOR_PROGRAM__LLM_ENGINE_STARTRETRIES=5
+# Advanced (specific program): SUPERVISOR_PROGRAM__APP_STARTRETRIES=5
 ```
 
 ## Framework-Specific Examples

python/model_hosting_container_standards/supervisor/generator.py

@@ -23,9 +23,9 @@
 # - startretries=N: Maximum restart attempts before entering FATAL state
 #
 # FATAL state examples (supervisorctl status output):
-#   llm_engine                       FATAL     Exited too quickly (process log may have details)
-#   llm_engine                       FATAL     can't find command '/path/to/missing/binary'
-#   llm_engine                       FATAL     spawn error
+#   app                       FATAL     Exited too quickly (process log may have details)
+#   app                       FATAL     can't find command '/path/to/missing/binary'
+#   app                       FATAL     spawn error
 #
 # When a program enters FATAL state (too many restart failures), the entrypoint script
 # will detect this and exit with code 1 to signal container failure.
@@ -72,7 +72,7 @@ def get_base_config_template(
 def generate_supervisord_config(
     config: SupervisorConfig,
     launch_command: str,
-    program_name: str = "llm_engine",
+    program_name: str = "app",
 ) -> str:
     """Generate supervisord configuration content with validation and logging.
 
@@ -134,7 +134,7 @@ def write_supervisord_config(
     config_path: str,
     config: SupervisorConfig,
     launch_command: str,
-    program_name: str = "llm_engine",
+    program_name: str = "app",
 ) -> None:
     """Write supervisord configuration to file with comprehensive error handling.
 

python/model_hosting_container_standards/supervisor/scripts/generate_supervisor_config.py

@@ -27,9 +27,7 @@ def main() -> int:
         "-o", "--output", required=True, help="Output path for config file"
     )
 
-    parser.add_argument(
-        "-p", "--program-name", default="llm_engine", help="Program name"
-    )
+    parser.add_argument("-p", "--program-name", default="app", help="Program name")
     parser.add_argument(
         "--log-level",
         choices=["ERROR", "INFO", "DEBUG"],

python/model_hosting_container_standards/supervisor/scripts/standard_supervisor.py

@@ -161,7 +161,7 @@ def run(self) -> int:
             return 1
 
         config_path = config.config_path
-        program_name = "llm_engine"
+        program_name = "app"
 
         try:
             # Generate and start supervisor

python/tests/integration/test_supervisor_cli_integration.py

@@ -60,9 +60,9 @@ def test_basic_cli_execution_and_config_generation(self, clean_env):
         """Test basic CLI execution with configuration generation and validation."""
         env = {
             "PROCESS_MAX_START_RETRIES": "2",
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS": "2",
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STOPWAITSECS": "5",
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_AUTORESTART": "true",
+            "SUPERVISOR_PROGRAM__APP_STARTSECS": "2",
+            "SUPERVISOR_PROGRAM__APP_STOPWAITSECS": "5",
+            "SUPERVISOR_PROGRAM__APP_AUTORESTART": "true",
             "LOG_LEVEL": "info",
         }
 
@@ -100,10 +100,10 @@ def test_basic_cli_execution_and_config_generation(self, clean_env):
 
                 # Check main sections exist
                 assert "supervisord" in config.sections()
-                assert "program:llm_engine" in config.sections()
+                assert "program:app" in config.sections()
 
                 # Verify program configuration
-                program_section = config["program:llm_engine"]
+                program_section = config["program:app"]
                 assert "python" in program_section["command"]
                 assert program_section["startsecs"] == "2"
                 assert program_section["stopwaitsecs"] == "5"
@@ -126,10 +126,10 @@ def test_ml_framework_configuration(self, clean_env):
         """Test supervisor configuration for ML framework scenarios."""
         env = {
             "PROCESS_MAX_START_RETRIES": "3",
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS": "30",  # ML models need longer startup
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STOPWAITSECS": "60",  # Graceful shutdown time
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STARTRETRIES": "3",
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_AUTORESTART": "true",
+            "SUPERVISOR_PROGRAM__APP_STARTSECS": "30",  # ML models need longer startup
+            "SUPERVISOR_PROGRAM__APP_STOPWAITSECS": "60",  # Graceful shutdown time
+            "SUPERVISOR_PROGRAM__APP_STARTRETRIES": "3",
+            "SUPERVISOR_PROGRAM__APP_AUTORESTART": "true",
             "LOG_LEVEL": "info",
         }
 
@@ -164,7 +164,7 @@ def test_ml_framework_configuration(self, clean_env):
                 ), f"Config file not found at {config_path}"
 
                 config = parse_supervisor_config(config_path)
-                program_section = config["program:llm_engine"]
+                program_section = config["program:app"]
 
                 # ML frameworks need longer startup and shutdown times
                 assert program_section["startsecs"] == "30"
@@ -191,8 +191,8 @@ def test_signal_handling(self, clean_env):
         """Test that supervisor handles signals correctly."""
         env = {
             "PROCESS_MAX_START_RETRIES": "1",
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS": "1",
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STOPWAITSECS": "5",
+            "SUPERVISOR_PROGRAM__APP_STARTSECS": "1",
+            "SUPERVISOR_PROGRAM__APP_STOPWAITSECS": "5",
             "LOG_LEVEL": "info",
         }
 
@@ -240,9 +240,9 @@ def test_signal_handling(self, clean_env):
     def test_continuous_restart_behavior(self, clean_env):
         """Test that supervisor continuously restarts processes when autorestart=true."""
         env = {
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS": "2",
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_AUTORESTART": "true",
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STARTRETRIES": "10",
+            "SUPERVISOR_PROGRAM__APP_STARTSECS": "2",
+            "SUPERVISOR_PROGRAM__APP_AUTORESTART": "true",
+            "SUPERVISOR_PROGRAM__APP_STARTRETRIES": "10",
             "LOG_LEVEL": "info",
         }
 
@@ -313,7 +313,7 @@ def test_continuous_restart_behavior(self, clean_env):
 
                 # Verify config
                 config = parse_supervisor_config(config_path)
-                program_section = config["program:llm_engine"]
+                program_section = config["program:app"]
                 assert program_section["autorestart"] == "true"
 
                 print(
@@ -332,9 +332,9 @@ def test_continuous_restart_behavior(self, clean_env):
     def test_startup_retry_limit(self, clean_env):
         """Test that supervisor respects startretries limit."""
         env = {
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STARTSECS": "5",  # Process must run 5 seconds to be "started"
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_STARTRETRIES": "3",  # Only 3 startup attempts
-            "SUPERVISOR_PROGRAM__LLM_ENGINE_AUTORESTART": "true",
+            "SUPERVISOR_PROGRAM__APP_STARTSECS": "5",  # Process must run 5 seconds to be "started"
+            "SUPERVISOR_PROGRAM__APP_STARTRETRIES": "3",  # Only 3 startup attempts
+            "SUPERVISOR_PROGRAM__APP_AUTORESTART": "true",
             "LOG_LEVEL": "info",
         }
 
@@ -386,7 +386,7 @@ def test_startup_retry_limit(self, clean_env):
                 # Verify config was generated
                 assert os.path.exists(config_path), "Config file should exist"
                 config = parse_supervisor_config(config_path)
-                program_section = config["program:llm_engine"]
+                program_section = config["program:app"]
                 assert program_section["startretries"] == "3"
                 assert program_section["startsecs"] == "5"
 
@@ -406,7 +406,7 @@ def test_startup_retry_limit(self, clean_env):
                 ), f"Expected {expected_attempts} startup attempts, got {attempt_count}"
 
                 # Check supervisord log for FATAL state
-                log_path = "/tmp/supervisord-llm_engine.log"
+                log_path = "/tmp/supervisord-app.log"
                 if os.path.exists(log_path):
                     with open(log_path, "r") as f:
                         log_content = f.read()

python/tests/supervisor/test_generator.py

@@ -39,10 +39,7 @@ def test_basic_template_structure(self):
 
         # Check all required sections exist
         expected_sections = [
-            "unix_http_server",
-            "supervisorctl",
             "supervisord",
-            "rpcinterface:supervisor",
             "program:test_program",
         ]