patch tests

Author: scienmind

tests/fixtures/setup-test-env.sh

@@ -128,8 +128,17 @@ create_mount_point() {
 
 # Export test configuration
 export_test_config() {
+    local loop_dev=$1
     local config_file="/tmp/test_env.conf"
 
+    # Get UUID of the loop device (for unlock_device function)
+    local loop_uuid
+    loop_uuid=$(blkid -s UUID -o value "$loop_dev")
+    
+    # Get UUID of the LVM logical volume (for mount tests)
+    local lv_uuid
+    lv_uuid=$(blkid -s UUID -o value "/dev/$TEST_VG_NAME/$TEST_LV_NAME")
+    
     cat > "$config_file" <<EOF
 # Test environment configuration
 export TEST_LUKS_NAME="$TEST_LUKS_NAME"
@@ -139,9 +148,15 @@ export TEST_MOUNT_POINT="$TEST_MOUNT_POINT"
 export TEST_PASSWORD="$TEST_PASSWORD"
 export TEST_LUKS_DEV="/dev/mapper/$TEST_LUKS_NAME"
 export TEST_LV_DEV="/dev/$TEST_VG_NAME/$TEST_LV_NAME"
+export TEST_LOOP_UUID="$loop_uuid"
+export TEST_LV_UUID="$lv_uuid"
+export TEST_LUKS_MAPPER="$TEST_LUKS_NAME"
+export TEST_LV_MAPPER="$TEST_VG_NAME-$TEST_LV_NAME"
 EOF
 
     log_info "Test configuration exported to $config_file"
+    log_info "  Loop device UUID: $loop_uuid"
+    log_info "  LV UUID: $lv_uuid"
     log_info "Source with: source $config_file"
 }
 
@@ -152,11 +167,12 @@ main() {
     check_privileges
     install_dependencies
 
-    local loop_dev=$(create_loop_device)
+    local loop_dev
+    loop_dev=$(create_loop_device)
     create_luks_container "$loop_dev"
     create_lvm_on_luks
     create_mount_point
-    export_test_config
+    export_test_config "$loop_dev"
 
     log_info "Test environment setup complete!"
     log_info ""

tests/integration/test-luks.sh

@@ -51,35 +51,31 @@ run_test() {
 test_luks_lock_unlock() {
     run_test "LUKS lock and unlock"
 
-    # Get loop device for LUKS container
-    local loop_dev=$(losetup -j /tmp/test_loop.img | cut -d: -f1)
-    
-    # Close LUKS
-    if lock_device "$TEST_LUKS_NAME"; then
+    if lock_device "$TEST_LUKS_MAPPER" "luks"; then
         log_pass "Successfully closed LUKS container"
     else
         log_fail "Failed to close LUKS container"
         return 1
     fi
 
     # Verify it's closed
-    if [[ ! -e "/dev/mapper/$TEST_LUKS_NAME" ]]; then
+    if [[ ! -e "/dev/mapper/$TEST_LUKS_MAPPER" ]]; then
         log_pass "LUKS container is closed"
     else
         log_fail "LUKS container still exists after close"
         return 1
     fi
 
-    # Reopen LUKS
-    if echo -n "$TEST_PASSWORD" | unlock_device "$loop_dev" "$TEST_LUKS_NAME" "luks"; then
+    # Reopen LUKS using UUID
+    if echo -n "$TEST_PASSWORD" | unlock_device "$TEST_LOOP_UUID" "$TEST_LUKS_MAPPER" "none" "luks"; then
         log_pass "Successfully reopened LUKS container"
     else
         log_fail "Failed to reopen LUKS container"
         return 1
     fi
 
     # Verify it's open
-    if [[ -e "/dev/mapper/$TEST_LUKS_NAME" ]]; then
+    if [[ -e "/dev/mapper/$TEST_LUKS_MAPPER" ]]; then
         log_pass "LUKS container is open"
     else
         log_fail "LUKS container does not exist after open"
@@ -91,41 +87,38 @@ test_luks_lock_unlock() {
 test_luks_wrong_password() {
     run_test "LUKS wrong password handling"
 
-    local loop_dev=$(losetup -j /tmp/test_loop.img | cut -d: -f1)
-    
     # Close first
-    lock_device "$TEST_LUKS_NAME" &>/dev/null
+    lock_device "$TEST_LUKS_MAPPER" "luks" &>/dev/null
 
     # Try to open with wrong password
-    if echo -n "wrongpassword" | unlock_device "$loop_dev" "$TEST_LUKS_NAME" "luks" 2>/dev/null; then
+    if echo -n "wrongpassword" | unlock_device "$TEST_LOOP_UUID" "$TEST_LUKS_MAPPER" "none" "luks" 2>/dev/null; then
         log_fail "LUKS opened with wrong password (should have failed)"
         return 1
     else
         log_pass "LUKS correctly rejected wrong password"
     fi
 
     # Reopen with correct password for subsequent tests
-    echo -n "$TEST_PASSWORD" | unlock_device "$loop_dev" "$TEST_LUKS_NAME" "luks" &>/dev/null
+    echo -n "$TEST_PASSWORD" | unlock_device "$TEST_LOOP_UUID" "$TEST_LUKS_MAPPER" "none" "luks" &>/dev/null
 }
 
 # Test 3: Double close handling
 test_luks_double_close() {
     run_test "LUKS double close handling"
 
     # Close once
-    lock_device "$TEST_LUKS_NAME" &>/dev/null
+    lock_device "$TEST_LUKS_MAPPER" "luks" &>/dev/null
 
-    # Try to close again
-    if lock_device "$TEST_LUKS_NAME" 2>/dev/null; then
+    # Try to close again (library should skip if already closed)
+    if lock_device "$TEST_LUKS_MAPPER" "luks" 2>/dev/null; then
         log_pass "Double close handled gracefully"
     else
         log_fail "Double close returned error"
         return 1
     fi
 
     # Reopen for subsequent tests
-    local loop_dev=$(losetup -j /tmp/test_loop.img | cut -d: -f1)
-    echo -n "$TEST_PASSWORD" | unlock_device "$loop_dev" "$TEST_LUKS_NAME" "luks" &>/dev/null
+    echo -n "$TEST_PASSWORD" | unlock_device "$TEST_LOOP_UUID" "$TEST_LUKS_MAPPER" "none" "luks" &>/dev/null
 }
 
 # Run all tests

tests/integration/test-lvm.sh

@@ -51,7 +51,7 @@ run_test() {
 test_lvm_verify() {
     run_test "LVM verification"
 
-    if verify_lvm "$TEST_VG_NAME" "$TEST_LV_NAME"; then
+    if verify_lvm "$TEST_LV_NAME" "$TEST_VG_NAME"; then
         log_pass "LVM verification successful"
     else
         log_fail "LVM verification failed"
@@ -63,7 +63,7 @@ test_lvm_verify() {
 test_lvm_is_active() {
     run_test "LVM active check"
 
-    if lvm_is_active "$TEST_VG_NAME" "$TEST_LV_NAME"; then
+    if lvm_is_active "$TEST_LV_NAME" "$TEST_VG_NAME"; then
         log_pass "LVM is active"
     else
         log_fail "LVM is not active"
@@ -76,31 +76,31 @@ test_lvm_deactivate_activate() {
     run_test "LVM deactivate and reactivate"
 
     # Deactivate
-    if deactivate_lvm "$TEST_VG_NAME" "$TEST_LV_NAME"; then
+    if deactivate_lvm "$TEST_LV_NAME" "$TEST_VG_NAME"; then
         log_pass "Successfully deactivated LVM"
     else
         log_fail "Failed to deactivate LVM"
         return 1
     fi
 
     # Verify it's inactive
-    if ! lvm_is_active "$TEST_VG_NAME" "$TEST_LV_NAME"; then
+    if ! lvm_is_active "$TEST_LV_NAME" "$TEST_VG_NAME"; then
         log_pass "LVM is inactive"
     else
         log_fail "LVM is still active after deactivation"
         return 1
     fi
 
     # Reactivate
-    if activate_lvm "$TEST_VG_NAME" "$TEST_LV_NAME"; then
+    if activate_lvm "$TEST_LV_NAME" "$TEST_VG_NAME"; then
         log_pass "Successfully reactivated LVM"
     else
         log_fail "Failed to reactivate LVM"
         return 1
     fi
 
     # Verify it's active
-    if lvm_is_active "$TEST_VG_NAME" "$TEST_LV_NAME"; then
+    if lvm_is_active "$TEST_LV_NAME" "$TEST_VG_NAME"; then
         log_pass "LVM is active after reactivation"
     else
         log_fail "LVM is not active after reactivation"
@@ -113,25 +113,25 @@ test_lvm_double_deactivate() {
     run_test "LVM double deactivation handling"
 
     # Deactivate once
-    deactivate_lvm "$TEST_VG_NAME" "$TEST_LV_NAME" &>/dev/null
+    deactivate_lvm "$TEST_LV_NAME" "$TEST_VG_NAME" &>/dev/null
 
     # Try to deactivate again
-    if deactivate_lvm "$TEST_VG_NAME" "$TEST_LV_NAME" 2>/dev/null; then
+    if deactivate_lvm "$TEST_LV_NAME" "$TEST_VG_NAME" 2>/dev/null; then
         log_pass "Double deactivation handled gracefully"
     else
         log_fail "Double deactivation returned error"
         return 1
     fi
 
     # Reactivate for subsequent tests
-    activate_lvm "$TEST_VG_NAME" "$TEST_LV_NAME" &>/dev/null
+    activate_lvm "$TEST_LV_NAME" "$TEST_VG_NAME" &>/dev/null
 }
 
 # Test 5: Verify nonexistent VG/LV
 test_lvm_verify_nonexistent() {
     run_test "LVM verify nonexistent volume"
 
-    if verify_lvm "nonexistent_vg" "nonexistent_lv" 2>/dev/null; then
+    if verify_lvm "nonexistent_lv" "nonexistent_vg" 2>/dev/null; then
         log_fail "verify_lvm succeeded for nonexistent volume (should fail)"
         return 1
     else

tests/integration/test-mount.sh

@@ -51,23 +51,21 @@ run_test() {
 test_mount_unmount() {
     run_test "Mount and unmount device"
 
-    # Mount
-    if mount_device "$TEST_LV_DEV" "$TEST_MOUNT_POINT" "none"; then
+    if mount_device "$TEST_LV_MAPPER" "$TEST_MOUNT_POINT" "defaults"; then
         log_pass "Successfully mounted device"
     else
         log_fail "Failed to mount device"
         return 1
     fi
 
     # Verify it's mounted
-    if mountpoint -q "$TEST_MOUNT_POINT"; then
+    if mountpoint -q "/mnt/$TEST_MOUNT_POINT"; then
         log_pass "Device is mounted"
     else
         log_fail "Device is not mounted"
         return 1
     fi
 
-    # Unmount
     if unmount_device "$TEST_MOUNT_POINT"; then
         log_pass "Successfully unmounted device"
     else
@@ -76,7 +74,7 @@ test_mount_unmount() {
     fi
 
     # Verify it's unmounted
-    if ! mountpoint -q "$TEST_MOUNT_POINT"; then
+    if ! mountpoint -q "/mnt/$TEST_MOUNT_POINT"; then
         log_pass "Device is unmounted"
     else
         log_fail "Device is still mounted"
@@ -88,11 +86,10 @@ test_mount_unmount() {
 test_mount_write_read() {
     run_test "Mount, write, unmount, remount, read"
 
-    local test_file="$TEST_MOUNT_POINT/test_file.txt"
+    local test_file="/mnt/$TEST_MOUNT_POINT/test_file.txt"
     local test_content="Hello from integration tests!"
 
-    # Mount
-    mount_device "$TEST_LV_DEV" "$TEST_MOUNT_POINT" "none" &>/dev/null
+    mount_device "$TEST_LV_MAPPER" "$TEST_MOUNT_POINT" "defaults" &>/dev/null
 
     # Write test file
     if echo "$test_content" > "$test_file"; then
@@ -102,15 +99,15 @@ test_mount_write_read() {
         return 1
     fi
 
-    # Unmount
     unmount_device "$TEST_MOUNT_POINT" &>/dev/null
 
     # Remount
-    mount_device "$TEST_LV_DEV" "$TEST_MOUNT_POINT" "none" &>/dev/null
+    mount_device "$TEST_LV_MAPPER" "$TEST_MOUNT_POINT" "defaults" &>/dev/null
 
     # Read and verify
     if [[ -f "$test_file" ]]; then
-        local read_content=$(cat "$test_file")
+        local read_content
+        read_content=$(cat "$test_file")
         if [[ "$read_content" == "$test_content" ]]; then
             log_pass "Successfully read test file with correct content"
         else
@@ -132,10 +129,10 @@ test_double_mount() {
     run_test "Double mount handling"
 
     # Mount once
-    mount_device "$TEST_LV_DEV" "$TEST_MOUNT_POINT" "none" &>/dev/null
+    mount_device "$TEST_LV_MAPPER" "$TEST_MOUNT_POINT" "defaults" &>/dev/null
 
-    # Try to mount again
-    if mount_device "$TEST_LV_DEV" "$TEST_MOUNT_POINT" "none" 2>/dev/null; then
+    # Try to mount again (library should skip if already mounted)
+    if mount_device "$TEST_LV_MAPPER" "$TEST_MOUNT_POINT" "defaults" 2>/dev/null; then
         log_pass "Double mount handled gracefully"
     else
         log_fail "Double mount returned error"
@@ -152,12 +149,12 @@ test_double_unmount() {
     run_test "Double unmount handling"
 
     # Mount first
-    mount_device "$TEST_LV_DEV" "$TEST_MOUNT_POINT" "none" &>/dev/null
+    mount_device "$TEST_LV_MAPPER" "$TEST_MOUNT_POINT" "defaults" &>/dev/null
 
     # Unmount once
     unmount_device "$TEST_MOUNT_POINT" &>/dev/null
 
-    # Try to unmount again
+    # Try to unmount again (library should skip if not mounted)
     if unmount_device "$TEST_MOUNT_POINT" 2>/dev/null; then
         log_pass "Double unmount handled gracefully"
     else
@@ -166,24 +163,24 @@ test_double_unmount() {
     fi
 }
 
-# Test 5: Mount with "none" UUID
-test_mount_none_uuid() {
-    run_test "Mount with UUID='none'"
+# Test 5: Mount with "none" device handling
+test_mount_none_device() {
+    run_test "Mount with device='none'"
 
-    # Try to mount with "none" UUID
-    if mount_device "none" "$TEST_MOUNT_POINT" "none"; then
-        log_pass "mount_device with 'none' UUID handled correctly"
+    # Mount with "none" device (library should skip)
+    if mount_device "none" "test_none" "defaults"; then
+        log_pass "mount_device with 'none' device handled correctly"
     else
-        log_fail "mount_device with 'none' UUID returned error"
+        log_fail "mount_device with 'none' device returned error"
         return 1
     fi
 
     # Verify nothing was actually mounted
-    if ! mountpoint -q "$TEST_MOUNT_POINT"; then
-        log_pass "Nothing mounted for 'none' UUID"
+    if ! mountpoint -q "/mnt/test_none"; then
+        log_pass "Nothing mounted for 'none' device"
     else
-        log_fail "Something was mounted for 'none' UUID"
-        unmount_device "$TEST_MOUNT_POINT" &>/dev/null
+        log_fail "Something was mounted for 'none' device"
+        unmount_device "test_none" &>/dev/null
         return 1
     fi
 }
@@ -199,7 +196,7 @@ main() {
     test_mount_write_read
     test_double_mount
     test_double_unmount
-    test_mount_none_uuid
+    test_mount_none_device
 
     echo ""
     echo "========================================="