2 integ happycase tests

Author: Mohamed Zeidan

test/integration_tests/cluster_management/test_cli_cluster_stack_deletion.py

@@ -1,19 +1,19 @@
 """
 Integration tests for CLI cluster stack deletion functionality.
 
-Tests the complete user workflow for deleting cluster stacks via CLI commands.
-Uses CLI commands as a user would, focusing on deletion process and error handling.
+Tests the basic happy path user workflow for deleting cluster stacks via CLI commands.
+Focuses on core functionality with minimal stack creation/deletion overhead.
+
+Detailed error handling and edge cases are covered by unit tests.
 """
 import time
 import pytest
 import boto3
-from unittest.mock import patch, MagicMock
 from click.testing import CliRunner
 
 from sagemaker.hyperpod.cli.commands.cluster_stack import delete_cluster_stack
 from test.integration_tests.cluster_management.utils import (
     assert_command_succeeded,
-    assert_command_failed_with_helpful_error,
     assert_yes_no_prompt_displayed,
     assert_success_message_displayed,
 )
@@ -30,13 +30,6 @@ def runner():
     return CliRunner()
 
 
-@pytest.fixture(scope="module")
-def test_stack_name():
-    """Generate a unique test stack name."""
-    import uuid
-    return f"{TEST_STACK_PREFIX}-{str(uuid.uuid4())[:8]}"
-
-
 @pytest.fixture(scope="module")
 def cfn_client():
     """CloudFormation client for test infrastructure."""
@@ -96,69 +89,11 @@ def wait_for_stack_delete_complete(cfn_client, stack_name, timeout_minutes=10):
 
 # --------- CLI Delete Tests ---------
 
-@pytest.mark.dependency(name="test_delete_nonexistent_stack")
-def test_delete_nonexistent_stack_error_handling(runner):
-    """Test CLI error handling when trying to delete a non-existent stack."""
-    nonexistent_stack = "nonexistent-stack-12345"
-    
-    result = runner.invoke(delete_cluster_stack, [
-        nonexistent_stack,
-        "--region", REGION
-    ], input='y\n', catch_exceptions=False)
-    
-    # CLI shows user-friendly error message but doesn't fail with non-zero exit code
-    assert "not found" in result.output.lower()
-    assert nonexistent_stack in result.output
-
-
-@pytest.mark.dependency(name="test_delete_with_confirmation_prompt")
-def test_delete_with_confirmation_prompt(runner, test_stack_name, cfn_client):
-    """Test CLI deletion with user confirmation prompt."""
-    # Create test stack
-    create_test_stack(cfn_client, test_stack_name)
-    
-    # Test deletion with confirmation prompt (simulate 'n' response)
-    result = runner.invoke(delete_cluster_stack, [
-        test_stack_name,
-        "--region", REGION
-    ], input='n\n', catch_exceptions=False)
-    
-    # Should show confirmation prompt and abort on 'n'
-    assert_yes_no_prompt_displayed(result)
-    assert "Aborted" in result.output or "cancelled" in result.output.lower()
-    
-    # Verify stack still exists
-    response = cfn_client.describe_stacks(StackName=test_stack_name)
-    assert len(response['Stacks']) == 1
-    assert response['Stacks'][0]['StackStatus'] != 'DELETE_COMPLETE'
-
-
-@pytest.mark.dependency(name="test_delete_with_user_confirmation_yes", depends=["test_delete_with_confirmation_prompt"])
-def test_delete_with_user_confirmation_yes(runner, test_stack_name, cfn_client):
-    """Test CLI deletion with user confirmation (yes response)."""
-    result = runner.invoke(delete_cluster_stack, [
-        test_stack_name,
-        "--region", REGION
-    ], input='y\n', catch_exceptions=False)
-    
-    assert_command_succeeded(result)
-    assert_success_message_displayed(result, ["deletion", "initiated"])
-    
-    # Wait for deletion to complete
-    wait_for_stack_delete_complete(cfn_client, test_stack_name)
-    
-    # Verify stack is deleted
-    with pytest.raises(Exception) as exc_info:
-        cfn_client.describe_stacks(StackName=test_stack_name)
-    assert "does not exist" in str(exc_info.value)
-
-
-@pytest.mark.dependency(name="test_delete_with_user_confirmation")
 def test_delete_with_user_confirmation(runner, cfn_client):
-    """Test CLI deletion with user confirmation (yes response)."""
-    # Create a new test stack for this test
+    """Test CLI deletion happy path with user confirmation."""
+    # Create a test stack for this test
     import uuid
-    stack_name = f"{TEST_STACK_PREFIX}-confirm-{str(uuid.uuid4())[:8]}"
+    stack_name = f"{TEST_STACK_PREFIX}-happy-{str(uuid.uuid4())[:8]}"
     create_test_stack(cfn_client, stack_name)
 
     try:
@@ -187,54 +122,3 @@ def test_delete_with_user_confirmation(runner, cfn_client):
         except:
             pass
         raise
-
-
-@pytest.mark.dependency(name="test_retain_resources_validation")
-def test_retain_resources_validation_error(runner, cfn_client):
-    """Test CLI validation of retain-resources parameter on non-DELETE_FAILED stack."""
-    # Create a test stack in CREATE_COMPLETE state
-    import uuid
-    stack_name = f"{TEST_STACK_PREFIX}-retain-{str(uuid.uuid4())[:8]}"
-    create_test_stack(cfn_client, stack_name)
-    
-    try:
-        # Try to delete with retain-resources (should fail validation)
-        result = runner.invoke(delete_cluster_stack, [
-            stack_name,
-            "--region", REGION,
-            "--retain-resources", "TestBucket"
-        ], input='y\n', catch_exceptions=False)
-        
-        # Should fail with helpful error about retain-resources limitation
-        assert result.exit_code != 0
-        assert "retain" in result.output.lower()
-        assert "only works on failed deletions" in result.output or "DELETE_FAILED" in result.output
-        
-        # Verify stack still exists (deletion should not have been attempted)
-        response = cfn_client.describe_stacks(StackName=stack_name)
-        assert len(response['Stacks']) == 1
-        assert response['Stacks'][0]['StackStatus'] == 'CREATE_COMPLETE'
-        
-    finally:
-        # Cleanup
-        try:
-            cfn_client.delete_stack(StackName=stack_name)
-            wait_for_stack_delete_complete(cfn_client, stack_name)
-        except:
-            pass
-
-
-@pytest.mark.dependency(name="test_region_parameter")
-def test_region_parameter_handling(runner):
-    """Test CLI handling of region parameter."""
-    nonexistent_stack = "test-stack-region-param"
-    
-    # Test with explicit region
-    result = runner.invoke(delete_cluster_stack, [
-        nonexistent_stack,
-        "--region", "us-west-1"
-    ], input='y\n', catch_exceptions=False)
-    
-    # CLI shows user-friendly error message for non-existent stack
-    assert "not found" in result.output.lower() or "does not exist" in result.output.lower()
-    assert nonexistent_stack in result.output

test/integration_tests/cluster_management/test_sdk_cluster_stack_deletion.py

@@ -1,14 +1,15 @@
 """
 Integration tests for SDK cluster stack deletion functionality.
 
-Tests the HpClusterStack.delete() method and related SDK functionality.
-Focuses on programmatic usage patterns and error handling.
+Tests the basic happy path for HpClusterStack.delete() method.
+Focuses on core SDK functionality with minimal stack creation/deletion overhead.
+
+Detailed error handling and edge cases are covered by unit tests.
 """
 import time
 import pytest
 import boto3
 import uuid
-from unittest.mock import patch, MagicMock
 
 from sagemaker.hyperpod.cluster_management.hp_cluster_stack import HpClusterStack
 
@@ -35,14 +36,6 @@ def create_test_stack(cfn_client, stack_name):
                 "Properties": {
                     "BucketName": f"{stack_name.lower()}-sdk-test-bucket"
                 }
-            },
-            "TestParameter": {
-                "Type": "AWS::SSM::Parameter",
-                "Properties": {
-                    "Name": f"/test/{stack_name}/parameter",
-                    "Type": "String",
-                    "Value": "test-value"
-                }
             }
         },
         "Outputs": {
@@ -85,24 +78,6 @@ def wait_for_stack_delete_complete(cfn_client, stack_name, timeout_minutes=10):
 
 # --------- SDK Delete Tests ---------
 
-@pytest.mark.dependency(name="test_sdk_delete_nonexistent_stack")
-def test_sdk_delete_nonexistent_stack_error_handling():
-    """Test SDK error handling when trying to delete a non-existent stack."""
-    nonexistent_stack = f"nonexistent-stack-{str(uuid.uuid4())[:8]}"
-    
-    # Should raise ValueError with helpful message
-    with pytest.raises(ValueError) as exc_info:
-        HpClusterStack.delete(
-            stack_name=nonexistent_stack,
-            region=REGION
-        )
-    
-    error_message = str(exc_info.value).lower()
-    assert "not found" in error_message or "does not exist" in error_message
-    assert nonexistent_stack in str(exc_info.value)
-
-
-@pytest.mark.dependency(name="test_sdk_delete_basic_functionality")
 def test_sdk_delete_basic_functionality(cfn_client):
     """Test basic SDK deletion functionality with auto-confirmation."""
     # Create test stack
@@ -131,121 +106,3 @@ def test_sdk_delete_basic_functionality(cfn_client):
         except:
             pass
         raise
-
-
-@pytest.mark.dependency(name="test_sdk_delete_with_region_parameter")
-def test_sdk_delete_with_region_parameter(cfn_client):
-    """Test SDK deletion with explicit region parameter."""
-    # Create test stack
-    stack_name = f"{TEST_STACK_PREFIX}-region-{str(uuid.uuid4())[:8]}"
-    create_test_stack(cfn_client, stack_name)
-    
-    try:
-        # Delete using SDK with explicit region
-        HpClusterStack.delete(
-            stack_name=stack_name,
-            region=REGION
-        )
-        
-        # Wait for deletion to complete
-        wait_for_stack_delete_complete(cfn_client, stack_name)
-        
-        # Verify stack is deleted
-        with pytest.raises(Exception) as exc_info:
-            cfn_client.describe_stacks(StackName=stack_name)
-        assert "does not exist" in str(exc_info.value)
-        
-    except Exception:
-        # Cleanup in case of test failure
-        try:
-            cfn_client.delete_stack(StackName=stack_name)
-        except:
-            pass
-        raise
-
-
-@pytest.mark.dependency(name="test_sdk_retain_resources_validation")
-def test_sdk_retain_resources_validation_error(cfn_client):
-    """Test SDK validation of retain_resources parameter on non-DELETE_FAILED stack."""
-    # Create test stack in CREATE_COMPLETE state
-    stack_name = f"{TEST_STACK_PREFIX}-retain-{str(uuid.uuid4())[:8]}"
-    create_test_stack(cfn_client, stack_name)
-    
-    try:
-        # Try to delete with retain_resources (should raise ValueError)
-        with pytest.raises(ValueError) as exc_info:
-            HpClusterStack.delete(
-                stack_name=stack_name,
-                region=REGION,
-                retain_resources=["TestBucket"]
-            )
-        
-        # Should have helpful error about retain_resources limitation
-        error_message = str(exc_info.value).lower()
-        assert "retain" in error_message
-        assert "delete_failed" in error_message
-        assert "can only be used" in error_message or "only supported" in error_message or "only works" in error_message
-        
-        # Verify stack still exists (deletion should not have been attempted)
-        response = cfn_client.describe_stacks(StackName=stack_name)
-        assert len(response['Stacks']) == 1
-        assert response['Stacks'][0]['StackStatus'] == 'CREATE_COMPLETE'
-        
-    finally:
-        # Cleanup
-        try:
-            cfn_client.delete_stack(StackName=stack_name)
-            wait_for_stack_delete_complete(cfn_client, stack_name)
-        except:
-            pass
-
-
-@pytest.mark.dependency(name="test_sdk_delete_with_logging")
-def test_sdk_delete_with_custom_logger(cfn_client):
-    """Test SDK deletion with custom logger parameter."""
-    import logging
-    from io import StringIO
-    
-    # Create test stack
-    stack_name = f"{TEST_STACK_PREFIX}-logger-{str(uuid.uuid4())[:8]}"
-    create_test_stack(cfn_client, stack_name)
-    
-    # Set up custom logger to capture log messages
-    log_stream = StringIO()
-    logger = logging.getLogger(f"test_logger_{uuid.uuid4().hex[:8]}")
-    logger.setLevel(logging.INFO)
-    handler = logging.StreamHandler(log_stream)
-    handler.setFormatter(logging.Formatter('%(levelname)s: %(message)s'))
-    logger.addHandler(handler)
-    
-    try:
-        # Delete using SDK with custom logger
-        HpClusterStack.delete(
-            stack_name=stack_name,
-            region=REGION,
-            logger=logger
-        )
-        
-        # Check that logger captured relevant messages
-        log_output = log_stream.getvalue()
-        assert "auto-confirming" in log_output.lower() or "deletion" in log_output.lower()
-        
-        # Wait for deletion to complete
-        wait_for_stack_delete_complete(cfn_client, stack_name)
-        
-        # Verify stack is deleted
-        with pytest.raises(Exception) as exc_info:
-            cfn_client.describe_stacks(StackName=stack_name)
-        assert "does not exist" in str(exc_info.value)
-        
-    except Exception:
-        # Cleanup in case of test failure
-        try:
-            cfn_client.delete_stack(StackName=stack_name)
-        except:
-            pass
-        raise
-    finally:
-        # Clean up logger
-        logger.removeHandler(handler)
-        handler.close()