6737686 refactor(src/broker.rs): handle errors without panic, in tests — radicle-ci-broker

Radicle CI broker

refactor(src/broker.rs): handle errors without panic, in tests

Lars Wirzenius committed 1 year ago

commit 6737686d769df685041f7b3e8b413a2f3e3ad4a6
parent f0fcfa94eb1cba086dec60be0573f75c81772d8c

1 file changed +10 -10

modified src/broker.rs

@@ -197,8 +197,8 @@ mod test {

         test::{log_in_tests, mock_adapter, trigger_request, TestResult},
     };
     fn broker(filename: &Path) -> Broker {
         Broker::new(filename).unwrap()
     fn broker(filename: &Path) -> anyhow::Result<Broker> {
         Ok(Broker::new(filename)?)
     }
     fn rid() -> RepoId {

@@ -215,7 +215,7 @@ mod test {

     fn has_no_adapters_initially() -> TestResult<()> {
         let tmp = tempdir().unwrap();
         let db = tmp.path().join("db.db");
         let broker = broker(&db);
         let broker = broker(&db)?;
         let rid = rid();
         assert_eq!(broker.adapter(&rid), None);
         Ok(())

@@ -225,7 +225,7 @@ mod test {

     fn adds_adapter() -> TestResult<()> {
         let tmp = tempdir().unwrap();
         let db = tmp.path().join("db.db");
         let mut broker = broker(&db);
         let mut broker = broker(&db)?;
         let adapter = Adapter::default();
         let rid = rid();

@@ -238,7 +238,7 @@ mod test {

     fn does_not_find_unknown_repo() -> TestResult<()> {
         let tmp = tempdir().unwrap();
         let db = tmp.path().join("db.db");
         let mut broker = broker(&db);
         let mut broker = broker(&db)?;
         let adapter = Adapter::default();
         let rid = rid();

@@ -252,7 +252,7 @@ mod test {

     fn does_not_have_a_default_adapter_initially() -> TestResult<()> {
         let tmp = tempdir().unwrap();
         let db = tmp.path().join("db.db");
         let broker = broker(&db);
         let broker = broker(&db)?;
         assert_eq!(broker.default_adapter(), None);
         Ok(())

@@ -262,7 +262,7 @@ mod test {

     fn sets_a_default_adapter_initially() -> TestResult<()> {
         let tmp = tempdir().unwrap();
         let db = tmp.path().join("db.db");
         let mut broker = broker(&db);
         let mut broker = broker(&db)?;
         let adapter = Adapter::default();
         broker.set_default_adapter(&adapter);

@@ -274,7 +274,7 @@ mod test {

     fn finds_default_adapter_for_unknown_repo() -> TestResult<()> {
         let tmp = tempdir().unwrap();
         let db = tmp.path().join("db.db");
         let mut broker = broker(&db);
         let mut broker = broker(&db)?;
         let adapter = Adapter::default();
         broker.set_default_adapter(&adapter);

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

         let tmp = tempdir().unwrap();
         let db = tmp.path().join("db.db");
         let mut broker = broker(&db);
         let mut broker = broker(&db)?;
         broker.set_default_adapter(&adapter);
         let trigger = trigger_request()?;

@@ -331,7 +331,7 @@ exit 1

         let tmp = tempdir().unwrap();
         let db = tmp.path().join("db.db");
         let mut broker = broker(&db);
         let mut broker = broker(&db)?;
         broker.set_default_adapter(&adapter);
         let trigger = trigger_request()?;