From fd9cb5b20d395e8145ec69c82b46549c09e22886 Mon Sep 17 00:00:00 2001 From: Cyborus Date: Wed, 29 Nov 2023 14:32:49 -0500 Subject: [PATCH 1/7] add start of test --- tests/ci_test.rs | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 tests/ci_test.rs diff --git a/tests/ci_test.rs b/tests/ci_test.rs new file mode 100644 index 0000000..ffa6392 --- /dev/null +++ b/tests/ci_test.rs @@ -0,0 +1,6 @@ +#[test] +fn ci() { + let url = url::Url::parse(&std::env::var("FORGEJO_API_CI_INSTANCE_URL").unwrap()).unwrap(); + let token = std::env::var("FORGEJO_API_CI_TOKEN").unwrap(); + let api = forgejo_api::Forgejo::new(&token, url).unwrap(); +} From 62ac8f5d48046b41fd7a77778e080e9b4e196efc Mon Sep 17 00:00:00 2001 From: Cyborus Date: Wed, 29 Nov 2023 15:00:08 -0500 Subject: [PATCH 2/7] add ci pipeline --- .woodpecker/integration.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .woodpecker/integration.yml diff --git a/.woodpecker/integration.yml b/.woodpecker/integration.yml new file mode 100644 index 0000000..f6df423 --- /dev/null +++ b/.woodpecker/integration.yml @@ -0,0 +1,14 @@ +when: + - event: manual +steps: + test: + image: rust + environment: + - "FORGEJO_API_CI_INSTANCE_URL=http://forgejo-testing:3000/" + - FORGEJO_API_CI_TOKEN=0889eabbb0006f15be4af017c4e0d3f51df78f98 + commands: + - cargo test + +services: + forgejo-testing: + image: code.cartoon-aa.xyz/cyborus/ci-forgejo From cea10e2fcafbbae4d16f081524862240d41cc949 Mon Sep 17 00:00:00 2001 From: Cyborus Date: Wed, 29 Nov 2023 15:18:55 -0500 Subject: [PATCH 3/7] add testing boilerplate --- Cargo.lock | 29 +++++++++++++++++++++++++++++ Cargo.toml | 4 ++++ tests/ci_test.rs | 31 ++++++++++++++++++++++++++----- 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2c23273..0f001b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -128,6 +128,16 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "eyre" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "fastrand" version = "2.0.1" @@ -159,6 +169,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" name = "forgejo-api" version = "0.1.0" dependencies = [ + "eyre", "reqwest", "serde", "soft_assert", @@ -328,6 +339,12 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexmap" version = "1.9.3" @@ -843,9 +860,21 @@ dependencies = [ "mio", "pin-project-lite", "socket2 0.5.5", + "tokio-macros", "windows-sys", ] +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tokio-native-tls" version = "0.3.1" diff --git a/Cargo.toml b/Cargo.toml index d64f32a..56cea66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,3 +13,7 @@ tokio = { version = "1.29.1", features = ["net"] } url = { version = "2.4.0", features = ["serde"] } serde = { version = "1.0.168", features = ["derive"] } time = { version = "0.3.22", features = ["parsing", "serde", "formatting"] } + +[dev-dependencies] +eyre = "0.6.9" +tokio = { version = "1.29.1", features = ["net", "rt", "macros"] } diff --git a/tests/ci_test.rs b/tests/ci_test.rs index ffa6392..11d7e64 100644 --- a/tests/ci_test.rs +++ b/tests/ci_test.rs @@ -1,6 +1,27 @@ -#[test] -fn ci() { - let url = url::Url::parse(&std::env::var("FORGEJO_API_CI_INSTANCE_URL").unwrap()).unwrap(); - let token = std::env::var("FORGEJO_API_CI_TOKEN").unwrap(); - let api = forgejo_api::Forgejo::new(&token, url).unwrap(); +use forgejo_api::{Forgejo, ForgejoError}; + +#[tokio::test] +async fn ci() -> eyre::Result<()> { + let url = url::Url::parse(&std::env::var("FORGEJO_API_CI_INSTANCE_URL")?)?; + let token = std::env::var("FORGEJO_API_CI_TOKEN")?; + let api = Forgejo::new(&token, url)?; + + let mut results = Vec::new(); + + results.push(user(&api).await.map_err(|e| eyre::eyre!("user error: {e}"))); + + let mut errors = 0; + for res in results.into_iter().filter_map(Result::err) { + errors += 1; + println!("{res}"); + } + if errors > 0 { + eyre::bail!("test failed"); + } + + Ok(()) +} + +async fn user(api: &forgejo_api::Forgejo) -> Result<(), ForgejoError> { + Ok(()) } From f931a3345ef7c888f45c0280b8cd5c48a26e8a11 Mon Sep 17 00:00:00 2001 From: Cyborus Date: Wed, 29 Nov 2023 15:40:43 -0500 Subject: [PATCH 4/7] add user test --- tests/ci_test.rs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tests/ci_test.rs b/tests/ci_test.rs index 11d7e64..622fcdb 100644 --- a/tests/ci_test.rs +++ b/tests/ci_test.rs @@ -1,4 +1,5 @@ -use forgejo_api::{Forgejo, ForgejoError}; +use forgejo_api::Forgejo; +use eyre::{eyre, ensure}; #[tokio::test] async fn ci() -> eyre::Result<()> { @@ -8,7 +9,7 @@ async fn ci() -> eyre::Result<()> { let mut results = Vec::new(); - results.push(user(&api).await.map_err(|e| eyre::eyre!("user error: {e}"))); + results.push(user(&api).await.map_err(|e| eyre!("user error: {e}"))); let mut errors = 0; for res in results.into_iter().filter_map(Result::err) { @@ -22,6 +23,21 @@ async fn ci() -> eyre::Result<()> { Ok(()) } -async fn user(api: &forgejo_api::Forgejo) -> Result<(), ForgejoError> { +async fn user(api: &forgejo_api::Forgejo) -> eyre::Result<()> { + let myself = api.myself().await?; + ensure!(myself.is_admin, "user should be admin"); + ensure!(myself.login == "TestingAdmin", "user should be named \"TestingAdmin\""); + + let myself_indirect = api + .get_user("TestingAdmin") + .await? + .ok_or_else(|| eyre!("\"TestingAdmin\" not found, but should have been."))?; + ensure!(myself == myself_indirect, "result of `myself` does not match result of `get_user`"); + + let following = api.get_following("TestingAdmin").await?; + ensure!(following == Some(Vec::new()), "following list not empty"); + let followers = api.get_followers("TestingAdmin").await?; + ensure!(followers == Some(Vec::new()), "follower list not empty"); + Ok(()) } From 09d6765663d4d0f24261389c2499f18a16d499c4 Mon Sep 17 00:00:00 2001 From: Cyborus Date: Wed, 29 Nov 2023 16:24:28 -0500 Subject: [PATCH 5/7] add base repo test --- Cargo.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 3 ++- tests/ci_test.rs | 51 +++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 0f001b0..436e2be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -74,6 +74,7 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ + "jobserver", "libc", ] @@ -170,6 +171,7 @@ name = "forgejo-api" version = "0.1.0" dependencies = [ "eyre", + "git2", "reqwest", "serde", "soft_assert", @@ -233,6 +235,21 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +[[package]] +name = "git2" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +dependencies = [ + "bitflags 2.4.1", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + [[package]] name = "h2" version = "0.3.21" @@ -367,6 +384,15 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" version = "0.3.65" @@ -388,6 +414,46 @@ version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +[[package]] +name = "libgit2-sys" +version = "0.16.1+1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libssh2-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linux-raw-sys" version = "0.4.11" diff --git a/Cargo.toml b/Cargo.toml index 56cea66..6989702 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,4 +16,5 @@ time = { version = "0.3.22", features = ["parsing", "serde", "formatting"] } [dev-dependencies] eyre = "0.6.9" -tokio = { version = "1.29.1", features = ["net", "rt", "macros"] } +tokio = { version = "1.29.1", features = ["net", "fs", "rt", "macros"] } +git2 = "0.18.1" diff --git a/tests/ci_test.rs b/tests/ci_test.rs index 622fcdb..a74793f 100644 --- a/tests/ci_test.rs +++ b/tests/ci_test.rs @@ -10,6 +10,7 @@ async fn ci() -> eyre::Result<()> { let mut results = Vec::new(); results.push(user(&api).await.map_err(|e| eyre!("user error: {e}"))); + results.push(repo(&api).await.map_err(|e| eyre!("repo error: {e}"))); let mut errors = 0; for res in results.into_iter().filter_map(Result::err) { @@ -41,3 +42,53 @@ async fn user(api: &forgejo_api::Forgejo) -> eyre::Result<()> { Ok(()) } + +async fn repo(api: &forgejo_api::Forgejo) -> eyre::Result<()> { + tokio::fs::create_dir("/test_repo").await?; + let local_repo = git2::Repository::init("/test_repo")?; + tokio::fs::write("/test_repo/README.md", "# Test\nThis is a test repo").await?; + let mut index = local_repo.index()?; + index.add_all(["."], git2::IndexAddOption::DEFAULT, None)?; + index.write()?; + let tree = local_repo + .find_tree(index.write_tree().unwrap()) + .unwrap(); + let author = git2::Signature::now("TestingAdmin", "admin@noreply.example.org").unwrap(); + let commit_oid = local_repo + .commit(None, &author, &author, "bibblybeebly", &tree, &[]) + .unwrap(); + let branch = local_repo + .branch("main", &local_repo.find_commit(commit_oid).unwrap(), true) + .unwrap(); + let branch_ref = branch.into_reference(); + let branch_ref_name = branch_ref.name().unwrap(); + local_repo.set_head(branch_ref_name).unwrap(); + + let repo_opt = forgejo_api::CreateRepoOption { + auto_init: false, + default_branch: "main".into(), + description: Some("Test Repo".into()), + gitignores: "".into(), + issue_labels: "".into(), + license: "".into(), + name: "test".into(), + private: false, + readme: "".into(), + template: false, + trust_model: forgejo_api::TrustModel::Default, + }; + let remote_repo = api.create_repo(repo_opt).await?; + ensure!(remote_repo.owner.login == "TestingAdmin", "repo owner is not \"TestingAdmin\""); + ensure!(remote_repo.name == "test", "repo owner is not \"test\""); + + let mut callbacks = git2::RemoteCallbacks::new(); + callbacks.credentials(|_url, _username_from_url, _allowed_types| { + git2::Cred::userpass_plaintext("TestingAdmin", "password") + }); + let mut push_options = git2::PushOptions::new(); + push_options.remote_callbacks(callbacks); + let mut origin = local_repo.remote("origin", remote_repo.clone_url.as_str()).unwrap(); + origin.push(&[branch_ref_name], Some(&mut push_options)).unwrap(); + + Ok(()) +} From 1291c95545fa41c9d3adda2c1723d8cc4d0b087d Mon Sep 17 00:00:00 2001 From: Cyborus Date: Wed, 29 Nov 2023 16:52:16 -0500 Subject: [PATCH 6/7] add pr testing --- tests/ci_test.rs | 58 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/tests/ci_test.rs b/tests/ci_test.rs index a74793f..79f4aaa 100644 --- a/tests/ci_test.rs +++ b/tests/ci_test.rs @@ -47,22 +47,17 @@ async fn repo(api: &forgejo_api::Forgejo) -> eyre::Result<()> { tokio::fs::create_dir("/test_repo").await?; let local_repo = git2::Repository::init("/test_repo")?; tokio::fs::write("/test_repo/README.md", "# Test\nThis is a test repo").await?; + let mut index = local_repo.index()?; index.add_all(["."], git2::IndexAddOption::DEFAULT, None)?; index.write()?; - let tree = local_repo - .find_tree(index.write_tree().unwrap()) - .unwrap(); + let tree = local_repo.find_tree(index.write_tree().unwrap())?; let author = git2::Signature::now("TestingAdmin", "admin@noreply.example.org").unwrap(); - let commit_oid = local_repo - .commit(None, &author, &author, "bibblybeebly", &tree, &[]) - .unwrap(); - let branch = local_repo - .branch("main", &local_repo.find_commit(commit_oid).unwrap(), true) - .unwrap(); + let commit_oid = local_repo.commit(None, &author, &author, "bibblybeebly", &tree, &[])?; + let branch = local_repo.branch("main", &local_repo.find_commit(commit_oid).unwrap(), true)?; let branch_ref = branch.into_reference(); - let branch_ref_name = branch_ref.name().unwrap(); - local_repo.set_head(branch_ref_name).unwrap(); + let branch_ref_name = branch_ref.name().ok_or_else(|| eyre!("branch name not found"))?; + local_repo.set_head(branch_ref_name)?; let repo_opt = forgejo_api::CreateRepoOption { auto_init: false, @@ -87,8 +82,45 @@ async fn repo(api: &forgejo_api::Forgejo) -> eyre::Result<()> { }); let mut push_options = git2::PushOptions::new(); push_options.remote_callbacks(callbacks); - let mut origin = local_repo.remote("origin", remote_repo.clone_url.as_str()).unwrap(); - origin.push(&[branch_ref_name], Some(&mut push_options)).unwrap(); + let mut origin = local_repo.remote("origin", remote_repo.clone_url.as_str())?; + origin.push(&[branch_ref_name], Some(&mut push_options))?; + + tokio::fs::write("/test_repo/example.rs", "fn add_one(x: u32) -> u32 { x + 1 }").await?; + let mut index = local_repo.index()?; + index.add_all(["."], git2::IndexAddOption::DEFAULT, None)?; + index.write()?; + let tree = local_repo.find_tree(index.write_tree().unwrap())?; + let commit_oid = local_repo.commit(None, &author, &author, "egg", &tree, &[])?; + let branch = local_repo.branch("test", &local_repo.find_commit(commit_oid).unwrap(), true)?; + let branch_ref = branch.into_reference(); + let branch_ref_name = branch_ref.name().ok_or_else(|| eyre!("branch name not found"))?; + local_repo.set_head(branch_ref_name)?; + + let pr_opt = forgejo_api::CreatePullRequestOption { + assignee: None, + assignees: vec!["TestingAdmin".into()], + base: "main".into(), + body: "This is a test PR".into(), + due_date: None, + head: "test".into(), + labels: Vec::new(), + milestone: None, + title: "test pr".into(), + }; + let pr = api.create_pr("TestingAdmin", "test", pr_opt).await?; + ensure!(!api.is_merged("TestingAdmin", "test", pr.number).await?, "pr should not yet be merged"); + let merge_opt = forgejo_api::MergePullRequestOption { + act: forgejo_api::MergePrAction::Merge, + merge_commit_id: None, + merge_message_field: None, + merge_title_field: None, + delete_branch_after_merge: Some(true), + force_merge: None, + head_commit_id: None, + merge_when_checks_succeed: None, + }; + api.merge_pr("TestingAdmin", "test", pr.number, merge_opt).await?; + ensure!(api.is_merged("TestingAdmin", "test", pr.number).await?, "pr should be merged"); Ok(()) } From 3737588e28cf590976cb41921ca6b82d649f930f Mon Sep 17 00:00:00 2001 From: Cyborus Date: Wed, 29 Nov 2023 16:57:42 -0500 Subject: [PATCH 7/7] add context to pr errors --- tests/ci_test.rs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/ci_test.rs b/tests/ci_test.rs index 79f4aaa..08ee904 100644 --- a/tests/ci_test.rs +++ b/tests/ci_test.rs @@ -96,6 +96,14 @@ async fn repo(api: &forgejo_api::Forgejo) -> eyre::Result<()> { let branch_ref_name = branch_ref.name().ok_or_else(|| eyre!("branch name not found"))?; local_repo.set_head(branch_ref_name)?; + let mut callbacks = git2::RemoteCallbacks::new(); + callbacks.credentials(|_url, _username_from_url, _allowed_types| { + git2::Cred::userpass_plaintext("TestingAdmin", "password") + }); + let mut push_options = git2::PushOptions::new(); + push_options.remote_callbacks(callbacks); + origin.push(&[branch_ref_name], Some(&mut push_options)).map_err(|e| eyre!("failed to push branch, {e}"))?; + let pr_opt = forgejo_api::CreatePullRequestOption { assignee: None, assignees: vec!["TestingAdmin".into()], @@ -107,8 +115,9 @@ async fn repo(api: &forgejo_api::Forgejo) -> eyre::Result<()> { milestone: None, title: "test pr".into(), }; - let pr = api.create_pr("TestingAdmin", "test", pr_opt).await?; - ensure!(!api.is_merged("TestingAdmin", "test", pr.number).await?, "pr should not yet be merged"); + let pr = api.create_pr("TestingAdmin", "test", pr_opt).await.map_err(|e| eyre!("couldn't create pr, {e}"))?; + let is_merged = api.is_merged("TestingAdmin", "test", pr.number).await.map_err(|e| eyre!("couldn't find unmerged pr {}, {}", pr.number, e))?; + ensure!(!is_merged, "pr should not yet be merged"); let merge_opt = forgejo_api::MergePullRequestOption { act: forgejo_api::MergePrAction::Merge, merge_commit_id: None, @@ -119,8 +128,9 @@ async fn repo(api: &forgejo_api::Forgejo) -> eyre::Result<()> { head_commit_id: None, merge_when_checks_succeed: None, }; - api.merge_pr("TestingAdmin", "test", pr.number, merge_opt).await?; - ensure!(api.is_merged("TestingAdmin", "test", pr.number).await?, "pr should be merged"); + api.merge_pr("TestingAdmin", "test", pr.number, merge_opt).await.map_err(|e| eyre!("couldn't merge pr {}, {}", pr.number, e))?; + let is_merged = api.is_merged("TestingAdmin", "test", pr.number).await.map_err(|e| eyre!("couldn't find merged pr {}, {}", pr.number, e))?; + ensure!(is_merged, "pr should be merged"); Ok(()) }