Fix save test data dependencies (librenms#18810)

* Fix save test data dependencies

* fix no module case

* better fix

* forced modules if user specifies os, variant, and modules

Author: murrant

scripts/save-test-data.php

@@ -61,7 +61,7 @@
     exit;
 }
 
-$os_name = false;
+$os_name = null;
 if (isset($options['o'])) {
     $os_name = $options['o'];
 } elseif (isset($options['os'])) {
@@ -96,7 +96,7 @@
 $os_list = [];
 
 if (isset($os_name) && isset($variant)) {
-    $os_list = [$full_os_name => [$os_name, $variant]];
+    $os_list = [$full_os_name => [$os_name, $variant, ModuleList::fromUserOverrides($modules)->overrides]];
 } elseif (isset($os_name)) {
     $os_list = ModuleTestHelper::findOsWithData($modules, $os_name);
 } else {
@@ -135,8 +135,7 @@
 
 try {
     $no_save = isset($options['n']) || isset($options['no-save']);
-    foreach ($os_list as $parts) {
-        [$target_os, $target_variant] = $parts;
+    foreach ($os_list as [$target_os, $target_variant, $resolved_modules]) {
         echo "OS: $target_os\n";
         echo "Module: $modules_input\n";
         if ($target_variant) {
@@ -145,7 +144,7 @@
         echo PHP_EOL;
 
         LibrenmsConfig::invalidateAndReload();
-        $tester = new ModuleTestHelper(ModuleList::fromUserOverrides($modules), $target_os, $target_variant);
+        $tester = new ModuleTestHelper(new ModuleList($resolved_modules), $target_os, $target_variant);
         if (! $no_save && ! empty($output_file)) {
             $tester->setJsonSavePath($output_file);
         }