File tree Expand file tree Collapse file tree 1 file changed +5
-2
lines changed
crates/chat-cli/src/cli/chat/tools/execute Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -437,7 +437,6 @@ mod tests {
437
437
}
438
438
439
439
#[ test]
440
- <<<<<<< HEAD
441
440
fn test_eval_perm ( ) {
442
441
let tool_name = if cfg ! ( windows) { "execute_cmd" } else { "execute_bash" } ;
443
442
let agent = Agent {
@@ -524,7 +523,10 @@ mod tests {
524
523
// Should contain both the existing value and our metadata
525
524
assert ! ( user_agent_value. contains( "ExistingValue" ) ) ;
526
525
assert ! ( user_agent_value. contains( USER_AGENT_APP_NAME ) ) ;
527
- =======
526
+ }
527
+
528
+ #[ test]
529
+ #[ cfg( unix) ]
528
530
fn test_eval_perm_allowed_tools_priority ( ) {
529
531
use crate :: cli:: agent:: { Agent , PermissionEvalResult } ;
530
532
@@ -561,6 +563,7 @@ mod tests {
561
563
}
562
564
563
565
#[ test]
566
+ #[ cfg( unix) ]
564
567
fn test_eval_perm_fine_grained_control ( ) {
565
568
use crate :: cli:: agent:: { Agent , PermissionEvalResult } ;
566
569
You can’t perform that action at this time.
0 commit comments