Radish alpha
r
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
refactor(src/broker.rs): handle more panics as errors in tests
Lars Wirzenius committed 1 year ago
commit cd071e09579e28f74e753803bad56b6b87619c58
parent 6737686d769df685041f7b3e8b413a2f3e3ad4a6
1 file changed +6 -6
modified src/broker.rs
@@ -201,9 +201,9 @@ mod test {
        Ok(Broker::new(filename)?)
    }

-
    fn rid() -> RepoId {
+
    fn rid() -> anyhow::Result<RepoId> {
        const RID: &str = "rad:zwTxygwuz5LDGBq255RA2CbNGrz8";
-
        RepoId::from_urn(RID).unwrap()
+
        Ok(RepoId::from_urn(RID)?)
    }

    fn rid2() -> RepoId {
@@ -216,7 +216,7 @@ mod test {
        let tmp = tempdir().unwrap();
        let db = tmp.path().join("db.db");
        let broker = broker(&db)?;
-
        let rid = rid();
+
        let rid = rid()?;
        assert_eq!(broker.adapter(&rid), None);
        Ok(())
    }
@@ -228,7 +228,7 @@ mod test {
        let mut broker = broker(&db)?;

        let adapter = Adapter::default();
-
        let rid = rid();
+
        let rid = rid()?;
        broker.set_repository_adapter(&rid, &adapter);
        assert_eq!(broker.adapter(&rid), Some(&adapter));
        Ok(())
@@ -241,7 +241,7 @@ mod test {
        let mut broker = broker(&db)?;

        let adapter = Adapter::default();
-
        let rid = rid();
+
        let rid = rid()?;
        let rid2 = rid2();
        broker.set_repository_adapter(&rid, &adapter);
        assert_eq!(broker.adapter(&rid2), None);
@@ -279,7 +279,7 @@ mod test {
        let adapter = Adapter::default();
        broker.set_default_adapter(&adapter);

-
        let rid = rid();
+
        let rid = rid()?;
        assert_eq!(broker.adapter(&rid), Some(&adapter));
        Ok(())
    }