mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

httpd: consistent default branch 

The test suite for `radicle-httpd` assumed that `master` would be used
for the working copy. However, if a user set their Git default branch
to be something other than `master` then the test suite will fail for
them.

To remedy this, initialise the working copy with the `master` branch
as well.

Signed-off-by: Fintan Halpenny <fintan.halpenny@gmail.com>
X-Clacks-Overhead: GNU Terry Pratchett
This commit is contained in:
Fintan Halpenny 2023-11-13 16:53:28 +00:00 committed by cloudhead
parent fbc5c5a027
commit 25ed6b8b28
No known key found for this signature in database
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
radicle-httpd/src/test.rs
View File

@ -95,6 +95,8 @@ pub fn contributor(dir: &Path) -> Context {
} }
fn seed_with_signer<G: Signer>(dir: &Path, profile: radicle::Profile, signer: &G) -> Context { fn seed_with_signer<G: Signer>(dir: &Path, profile: radicle::Profile, signer: &G) -> Context {
const DEFAULT_BRANCH: &'static str = "master";
let tracking_db = dir.join("radicle").join("node").join("tracking.db"); let tracking_db = dir.join("radicle").join("node").join("tracking.db");
let routing_db = dir.join("radicle").join("node").join("routing.db"); let routing_db = dir.join("radicle").join("node").join("routing.db");
let addresses_db = dir.join("radicle").join("node").join("addresses.db"); let addresses_db = dir.join("radicle").join("node").join("addresses.db");
@ -112,7 +114,9 @@ fn seed_with_signer<G: Signer>(dir: &Path, profile: radicle::Profile, signer: &G
fs::create_dir_all(&workdir).unwrap(); fs::create_dir_all(&workdir).unwrap();
// add commits to workdir (repo) // add commits to workdir (repo)
let repo = git2::Repository::init(&workdir).unwrap(); let mut opts = git2::RepositoryInitOptions::new();
opts.initial_head(DEFAULT_BRANCH);
let repo = git2::Repository::init_opts(&workdir, &opts).unwrap();
let tree = let tree =
radicle::git::write_tree(Path::new("README"), "Hello World!\n".as_bytes(), &repo).unwrap(); radicle::git::write_tree(Path::new("README"), "Hello World!\n".as_bytes(), &repo).unwrap();
@ -180,7 +184,7 @@ fn seed_with_signer<G: Signer>(dir: &Path, profile: radicle::Profile, signer: &G
let repo = git2::Repository::open(&workdir).unwrap(); let repo = git2::Repository::open(&workdir).unwrap();
let name = "hello-world".to_string(); let name = "hello-world".to_string();
let description = "Rad repository for tests".to_string(); let description = "Rad repository for tests".to_string();
let branch = RefString::try_from("master").unwrap(); let branch = RefString::try_from(DEFAULT_BRANCH).unwrap();
let visibility = Visibility::default(); let visibility = Visibility::default();
let (id, _, _) = radicle::rad::init( let (id, _, _) = radicle::rad::init(
&repo, &repo,