f0fcfa9 refactor(src/adapter.rs): avoid panic in tests, return error instead — radicle-ci-broker

Radicle CI broker

refactor(src/adapter.rs): avoid panic in tests, return error instead

Lars Wirzenius committed 1 year ago

commit f0fcfa94eb1cba086dec60be0573f75c81772d8c
parent 962e78482c890ae05040ddb46f809ef2a6bd3049

1 file changed +17 -17

modified src/adapter.rs

@@ -223,17 +223,17 @@ mod test {

         test::{log_in_tests, mock_adapter, trigger_request, TestResult},
     };
     fn run() -> Run {
         Run::new(
             RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8").unwrap(),
     fn run() -> anyhow::Result<Run> {
         Ok(Run::new(
             RepoId::from_urn("rad:zwTxygwuz5LDGBq255RA2CbNGrz8")?,
             "test.repo",
             Whence::branch(
                 "main",
                 Oid::try_from("ff3099ba5de28d954c41d0b5a84316f943794ea4").unwrap(),
                 Oid::try_from("ff3099ba5de28d954c41d0b5a84316f943794ea4")?,
                 Some("J. Random Hacker <random@example.com>"),
             ),
             "2024-02-29T12:58:12+02:00".into(),
         )
         ))
     }
     #[test]

@@ -250,7 +250,7 @@ echo '{"response":"finished","result":"success"}'

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         Adapter::new(&bin).run(&trigger_request()?, &mut run)?;
         assert_eq!(run.result(), Some(&RunResult::Success));

@@ -271,7 +271,7 @@ echo '{"response":"finished","result":"failure"}'

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         match x {

@@ -299,7 +299,7 @@ exit 1

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(x.is_err());

@@ -320,7 +320,7 @@ kill -9 $BASHPID

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(

@@ -345,7 +345,7 @@ kill -9 $BASHPID

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(x, Err(AdapterError::Failed(_))));

@@ -368,7 +368,7 @@ kill -9 $BASHPID

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(x, Err(AdapterError::Failed(_))));

@@ -390,7 +390,7 @@ echo '{"response":"finished","result":"success","bad":"field"}'

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         match x {

@@ -414,7 +414,7 @@ echo '{"response":"finished","result":"success"}'

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(

@@ -442,7 +442,7 @@ echo '{"response":"finished","result":"success"}'

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(

@@ -462,7 +462,7 @@ echo '{"response":"finished","result":"success"}'

         let tmp = tempdir()?;
         let bin = tmp.path().join("adapter.sh");
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         match x {

@@ -490,7 +490,7 @@ echo '{"response":"finished","result":"success"}'

         let bin = tmp.path().join("adapter.sh");
         write(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         match x {

@@ -522,7 +522,7 @@ echo '{"response":"finished","result":"success"}'

         let bin = tmp.path().join("adapter.sh");
         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut run = run()?;
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         match x {