test: fix merge

bytebeamio · Apr 1, 2024 · 2f365e8 · 2f365e8
1 parent 88b0fba
commit 2f365e8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/uplink/src/base/bridge/actions_lane.rs b/uplink/src/base/bridge/actions_lane.rs
@@ -560,7 +560,6 @@ mod tests {
 
         let action_1 = Action {
             action_id: "1".to_string(),
-            kind: "test".to_string(),
             name: "route_1".to_string(),
             payload: "test".to_string(),
             deadline: None,
@@ -584,7 +583,6 @@ mod tests {
 
         let action_2 = Action {
             action_id: "2".to_string(),
-            kind: "test".to_string(),
             name: "route_2".to_string(),
             payload: "test".to_string(),
             deadline: None,
@@ -628,7 +626,6 @@ mod tests {
 
         let action_1 = Action {
             action_id: "1".to_string(),
-            kind: "test".to_string(),
             name: "test".to_string(),
             payload: "test".to_string(),
             deadline: None,
@@ -643,7 +640,6 @@ mod tests {
 
         let action_2 = Action {
             action_id: "2".to_string(),
-            kind: "test".to_string(),
             name: "test".to_string(),
             payload: "test".to_string(),
             deadline: None,
@@ -684,7 +680,6 @@ mod tests {
 
         let action = Action {
             action_id: "1".to_string(),
-            kind: "test".to_string(),
             name: "test".to_string(),
             payload: "test".to_string(),
             deadline: None,
@@ -749,7 +744,6 @@ mod tests {
 
         let action = Action {
             action_id: "1".to_string(),
-            kind: "test".to_string(),
             name: "test".to_string(),
             payload: "test".to_string(),
             deadline: None,
@@ -819,7 +813,6 @@ mod tests {
 
         let action = Action {
             action_id: "1".to_string(),
-            kind: "tunshell".to_string(),
             name: "launch_shell".to_string(),
             payload: "test".to_string(),
             deadline: None,
@@ -830,7 +823,6 @@ mod tests {
 
         let action = Action {
             action_id: "2".to_string(),
-            kind: "test".to_string(),
             name: "test".to_string(),
             payload: "test".to_string(),
             deadline: None,
@@ -910,7 +902,6 @@ mod tests {
 
         let action = Action {
             action_id: "1".to_string(),
-            kind: "test".to_string(),
             name: "test".to_string(),
             payload: "test".to_string(),
             deadline: None,
@@ -921,7 +912,6 @@ mod tests {
 
         let action = Action {
             action_id: "2".to_string(),
-            kind: "tunshell".to_string(),
             name: "launch_shell".to_string(),
             payload: "test".to_string(),
             deadline: None,

diff --git a/uplink/src/collector/downloader.rs b/uplink/src/collector/downloader.rs
@@ -512,7 +512,6 @@ mod test {
         expected_forward.download_path = Some(downloader_path);
         let download_action = Action {
             action_id: "1".to_string(),
-            kind: "firmware_update".to_string(),
             name: "firmware_update".to_string(),
             payload: json!(download_update).to_string(),
             deadline: Some(Instant::now() + Duration::from_secs(60)),
@@ -573,7 +572,6 @@ mod test {
         };
         let correct_action = Action {
             action_id: "1".to_string(),
-            kind: "firmware_update".to_string(),
             name: "firmware_update".to_string(),
             payload: json!(correct_update).to_string(),
             deadline: Some(Instant::now() + Duration::from_secs(100)),
@@ -612,7 +610,6 @@ mod test {
         };
         let wrong_action = Action {
             action_id: "1".to_string(),
-            kind: "firmware_update".to_string(),
             name: "firmware_update".to_string(),
             payload: json!(wrong_update).to_string(),
             deadline: Some(Instant::now() + Duration::from_secs(100)),

diff --git a/uplink/src/collector/script_runner.rs b/uplink/src/collector/script_runner.rs
@@ -176,7 +176,6 @@ mod tests {
         actions_tx
             .send(Action {
                 action_id: "1".to_string(),
-                kind: "1".to_string(),
                 name: "test".to_string(),
                 payload: "".to_string(),
                 deadline: None,
@@ -200,7 +199,6 @@ mod tests {
         actions_tx
             .send(Action {
                 action_id: "1".to_string(),
-                kind: "1".to_string(),
                 name: "test".to_string(),
                 payload: "{\"url\": \"...\", \"content_length\": 0,\"file_name\": \"...\"}"
                     .to_string(),