From 835cfcf6d4bc70ae01060201d85ea5ac2545ec9c Mon Sep 17 00:00:00 2001 From: Scott Prutton Date: Tue, 2 Jul 2024 14:03:04 -0400 Subject: [PATCH] chore: bad merge from testing merge queues --- bin/veritech/src/args.rs | 1 - lib/dal/tests/integration_test/secret/with_actions.rs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/veritech/src/args.rs b/bin/veritech/src/args.rs index d8d43ad410..6cfe1af33a 100644 --- a/bin/veritech/src/args.rs +++ b/bin/veritech/src/args.rs @@ -54,7 +54,6 @@ pub(crate) struct Args { hide_env_values = true )] pub(crate) log_json: bool, - pub(crate) log_json_test: bool, /// NATS connection URL [example: 0.0.0.0:4222] #[arg(long, short = 'u')] diff --git a/lib/dal/tests/integration_test/secret/with_actions.rs b/lib/dal/tests/integration_test/secret/with_actions.rs index 99d851ed3d..001e400be4 100644 --- a/lib/dal/tests/integration_test/secret/with_actions.rs +++ b/lib/dal/tests/integration_test/secret/with_actions.rs @@ -119,7 +119,7 @@ async fn create_action_using_secret(ctx: &mut DalContext, nw: &WorkspaceSignup) .await .expect("unable to list actions for component"); assert_eq!( - 1, // expected + 0, // expected actions.len() // actual ); let create_action_id = actions.pop().expect("no actions found");