hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-25 04:54:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor logging configuration and streamline command execution in tests

Browse source 
- Updated the main function to conditionally disable file logging based on the `ATLAS_NO_FILE_LOG` environment variable, enhancing flexibility in logging behavior.
- Introduced a new `atlas_command` function to encapsulate command creation for tests, ensuring consistent command execution across various test files.
- Replaced direct usage of `ROJO_PATH` with `atlas_command` in multiple test utilities, improving code clarity and maintainability.

These changes aim to enhance the logging setup and simplify command handling in the test suite.
This commit is contained in:
Joe 2026-03-01 14:41:51 -06:00
parent c0f5a01e17
commit 380041dc2a
7 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/rojo_test/serve_util.rs
View file

@ -4,7 +4,7 @@ use std::{
fs,
io::Read as _,
path::{Path, PathBuf},
process::{Command, Stdio},
process::Stdio,
thread,
time::Duration,
};
@ -22,7 +22,7 @@ use librojo::web_api::{
use rojo_insta_ext::RedactionMap;
use crate::rojo_test::io_util::{
copy_recursive, get_working_dir_path, KillOnDrop, ROJO_PATH, SERVE_TESTS_PATH,
atlas_command, copy_recursive, get_working_dir_path, KillOnDrop, SERVE_TESTS_PATH,
};
/// Convenience method to run a `rojo serve` test.
@ -110,7 +110,7 @@ impl TestServeSession {
let port = get_port_number();
let port_string = port.to_string();
let rojo_process = Command::new(ROJO_PATH)
let rojo_process = atlas_command()
.args([
"serve",
project_path.to_str().unwrap(),
@ -163,7 +163,7 @@ impl TestServeSession {
let port = get_port_number();
let port_string = port.to_string();
let rojo_process = Command::new(ROJO_PATH)
let rojo_process = atlas_command()
.args([
"serve",
project_path.to_str().unwrap(),
@ -223,7 +223,7 @@ impl TestServeSession {
let port = get_port_number();
let port_string = port.to_string();
let rojo_process = Command::new(ROJO_PATH)
let rojo_process = atlas_command()
.args([
"serve",
project_path.to_str().unwrap(),
@ -257,7 +257,7 @@ impl TestServeSession {
let port_string = port.to_string();
let working_dir = get_working_dir_path();
let rojo_process = Command::new(ROJO_PATH)
let rojo_process = atlas_command()
.args([
"serve",
self.project_path.to_str().unwrap(),
@ -777,7 +777,7 @@ pub fn run_cli_syncback_on_chunks(
data: &[u8],
chunks: &[librojo::web_api::ServiceChunk],
) -> (TempDir, PathBuf) {
use crate::rojo_test::io_util::{copy_recursive, ROJO_PATH, SERVE_TESTS_PATH};
use crate::rojo_test::io_util::{atlas_command, copy_recursive, SERVE_TESTS_PATH};
let source_path = Path::new(SERVE_TESTS_PATH).join(fixture_name);
let dir = tempdir().expect("Couldn't create temp dir for CLI syncback");
@ -789,7 +789,7 @@ pub fn run_cli_syncback_on_chunks(
let rbxl_path = dir.path().join("input.rbxl");
fs::write(&rbxl_path, rbxl_data).expect("Failed to write rbxl");
let output = std::process::Command::new(ROJO_PATH)
let output = atlas_command()
.args([
"syncback",
project_path.to_str().unwrap(),
@ -984,7 +984,7 @@ pub fn fresh_rebuild_read(project_path: &Path) -> NormalizedInstance {
let port = get_port_number();
let port_string = port.to_string();
let process = Command::new(ROJO_PATH)
let process = atlas_command()
.args([
"serve",
project_file.to_str().unwrap(),