mirror of
https://github.com/nushell/nushell
synced 2025-01-08 03:09:00 +00:00
74dcd91cc3
* Use only $nu.env.PWD for getting current directory Because setting and reading to/from std::env changes the global state shich is problematic if we call `cd` from multiple threads (e.g., in a `par-each` block). With this change, when engine-q starts, it will either inherit existing PWD env var, or create a new one from `std::env::current_dir()`. Otherwise, everything that needs the current directory will get it from `$nu.env.PWD`. Each spawned external command will get its current directory per-process which should be thread-safe. One thing left to do is to patch nu-path for this as well since it uses `std::env::current_dir()` in its expansions. * Rename nu-path functions *_with is not *_relative which should be more descriptive and frees "with" for use in a followup commit. * Clone stack every each iter; Fix some commands Cloning the stack each iteration of `each` makes sure we're not reusing PWD between iterations. Some fixes in commands to make them use the new PWD. * Post-rebase cleanup, fmt, clippy * Change back _relative to _with in nu-path funcs Didn't use the idea I had for the new "_with". * Remove leftover current_dir from rebase * Add cwd sync at merge_delta() This makes sure the parser and completer always have up-to-date cwd. * Always pass absolute path to glob in ls * Do not allow PWD a relative path; Allow recovery Makes it possible to recover PWD by proceeding with the REPL cycle. * Clone stack in each also for byte/string stream * (WIP) Start moving env variables to engine state * (WIP) Move env vars to engine state (ugly) Quick and dirty code. * (WIP) Remove unused mut and args; Fmt * (WIP) Fix dataframe tests * (WIP) Fix missing args after rebase * (WIP) Clone only env vars, not the whole stack * (WIP) Add env var clone to `for` loop as well * Minor edits * Refactor merge_delta() to include stack merging. Less error-prone than doing it manually. * Clone env for each `update` command iteration * Mark env var hidden only when found in eng. state * Fix clippt warnings * Add TODO about env var reading * Do not clone empty environment in loops * Remove extra cwd collection * Split current_dir() into str and path; Fix autocd * Make completions respect PWD env var
97 lines
3.2 KiB
Rust
97 lines
3.2 KiB
Rust
use nu_engine::eval_block;
|
|
use nu_parser::parse;
|
|
use nu_protocol::{
|
|
engine::{Command, EngineState, Stack, StateWorkingSet},
|
|
PipelineData, Span, Value, CONFIG_VARIABLE_ID,
|
|
};
|
|
|
|
use super::eager::ToDataFrame;
|
|
use crate::Let;
|
|
|
|
pub fn test_dataframe(cmds: Vec<Box<dyn Command + 'static>>) {
|
|
if cmds.is_empty() {
|
|
panic!("Empty commands vector")
|
|
}
|
|
|
|
// The first element in the cmds vector must be the one tested
|
|
let examples = cmds[0].examples();
|
|
let mut engine_state = Box::new(EngineState::new());
|
|
|
|
let delta = {
|
|
// Base functions that are needed for testing
|
|
// Try to keep this working set small to keep tests running as fast as possible
|
|
let mut working_set = StateWorkingSet::new(&*engine_state);
|
|
working_set.add_decl(Box::new(Let));
|
|
working_set.add_decl(Box::new(ToDataFrame));
|
|
|
|
// Adding the command that is being tested to the working set
|
|
for cmd in cmds {
|
|
working_set.add_decl(cmd);
|
|
}
|
|
|
|
working_set.render()
|
|
};
|
|
|
|
let cwd = std::env::current_dir().expect("Could not get current working directory.");
|
|
let _ = engine_state.merge_delta(delta, None, &cwd);
|
|
|
|
for example in examples {
|
|
// Skip tests that don't have results to compare to
|
|
if example.result.is_none() {
|
|
continue;
|
|
}
|
|
let start = std::time::Instant::now();
|
|
|
|
let (block, delta) = {
|
|
let mut working_set = StateWorkingSet::new(&*engine_state);
|
|
let (output, err) = parse(&mut working_set, None, example.example.as_bytes(), false);
|
|
|
|
if let Some(err) = err {
|
|
panic!("test parse error in `{}`: {:?}", example.example, err)
|
|
}
|
|
|
|
(output, working_set.render())
|
|
};
|
|
|
|
let _ = engine_state.merge_delta(delta, None, &cwd);
|
|
|
|
let mut stack = Stack::new();
|
|
|
|
// Set up our initial config to start from
|
|
stack.vars.insert(
|
|
CONFIG_VARIABLE_ID,
|
|
Value::Record {
|
|
cols: vec![],
|
|
vals: vec![],
|
|
span: Span::test_data(),
|
|
},
|
|
);
|
|
|
|
match eval_block(
|
|
&engine_state,
|
|
&mut stack,
|
|
&block,
|
|
PipelineData::new(Span::test_data()),
|
|
) {
|
|
Err(err) => panic!("test eval error in `{}`: {:?}", example.example, err),
|
|
Ok(result) => {
|
|
let result = result.into_value(Span::test_data());
|
|
println!("input: {}", example.example);
|
|
println!("result: {:?}", result);
|
|
println!("done: {:?}", start.elapsed());
|
|
|
|
// Note. Value implements PartialEq for Bool, Int, Float, String and Block
|
|
// If the command you are testing requires to compare another case, then
|
|
// you need to define its equality in the Value struct
|
|
if let Some(expected) = example.result {
|
|
if result != expected {
|
|
panic!(
|
|
"the example result is different to expected value: {:?} != {:?}",
|
|
result, expected
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|