Merge pull request #4075 from systeminit/fix/bad-merge

chore: bad merge from testing merge queues
systeminit · Jul 2, 2024 · 40273fb · 40273fb
2 parents d77f8e9 + 835cfcf
commit 40273fb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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");