Use writable test assets dir; simplify setup

ReenigneArcher · ReenigneArcher · commit cb500b933add · 2026-01-31T10:28:53.000-05:00
Override SUNSHINE_ASSETS_DIR in tests to ${CMAKE_CURRENT_BINARY_DIR}/test_assets so tests use a writable assets directory. Update test_confighttp setup to create a temporary web directory, use std::filesystem::create_directories for WEB_DIR, and write test_page.html directly (removing the previous try/catch and existence checks). These changes simplify test setup and ensure test files are created in writable temp locations.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -79,6 +79,11 @@ list(APPEND TEST_DEFINITIONS SUNSHINE_TESTS)
 list(APPEND TEST_DEFINITIONS SUNSHINE_SOURCE_DIR="${CMAKE_SOURCE_DIR}")
 list(APPEND TEST_DEFINITIONS SUNSHINE_TEST_BIN_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 
+# Override SUNSHINE_ASSETS_DIR to use a writable temp directory for tests
+# Remove the existing definition from SUNSHINE_DEFINITIONS to avoid redefinition error
+list(FILTER SUNSHINE_DEFINITIONS EXCLUDE REGEX "^SUNSHINE_ASSETS_DIR=")
+list(APPEND TEST_DEFINITIONS SUNSHINE_ASSETS_DIR="${CMAKE_CURRENT_BINARY_DIR}/test_assets")
+
 if(NOT WIN32)
     find_package(Udev 255)  # we need 255+ for udevadm verify
     message(STATUS "UDEV_FOUND: ${UDEV_FOUND}")
diff --git a/tests/unit/test_confighttp.cpp b/tests/unit/test_confighttp.cpp
@@ -120,29 +120,18 @@ class ConfigHttpTest: public ::testing::Test {
     // Set test locale
     config::sunshine.locale = "en";
 
-    // Create test web directory
+    // Create test web directory in temp
     test_web_dir = std::filesystem::temp_directory_path() / "sunshine_test_confighttp";
     std::filesystem::create_directories(test_web_dir / "web");
 
-    // Create test HTML file in the actual WEB_DIR for getPage to read
-    // Note: WEB_DIR might not exist yet, so create it
-    try {
-      std::filesystem::path web_dir_path(WEB_DIR);
-      if (!std::filesystem::exists(web_dir_path)) {
-        std::filesystem::create_directories(web_dir_path);
-      }
-      web_dir_test_file = web_dir_path / "test_page.html";
+    // Create test HTML file in WEB_DIR, creating parent directories with proper permissions
+    std::filesystem::path web_dir_path(WEB_DIR);
+    std::filesystem::create_directories(web_dir_path);
+    web_dir_test_file = web_dir_path / "test_page.html";
 
-      std::ofstream test_html(web_dir_test_file);
-      if (test_html.is_open()) {
-        test_html << "<html><head><title>Test Page</title></head><body><h1>Test Page Content</h1></body></html>";
-        test_html.close();
-      }
-    } catch (const std::exception &e) {
-      // If we can't create the file, getPage tests will be skipped
-      // Log but don't fail setup
-      std::cerr << "Warning: Could not create test file in WEB_DIR: " << e.what() << std::endl;
-    }
+    std::ofstream test_html(web_dir_test_file);
+    test_html << "<html><head><title>Test Page</title></head><body><h1>Test Page Content</h1></body></html>";
+    test_html.close();
 
     // Write certificates to temp files (Simple-Web-Server expects file paths)
     cert_file = test_web_dir / "test_cert.pem";
