upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/tests/git_remote_nostr
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2024-12-16 09:00:46 +0000
committerDanConwayDev <DanConwayDev@protonmail.com>2024-12-16 09:46:30 +0000
commit4ee83e2fe5335a8afd78439c35f029c4a472e797 (patch)
treebdb111b191e7a68cb74ce29b4bb2757b4b7be91f /tests/git_remote_nostr
parent5fe839e2bf8ceb2931c1984efb2d956980431203 (diff)
chore: bump nix flake rust nightly `fmt` overlay
update the rust nightly `fmt` overlay which needs to be pinned to a specific version (this case by date) update formatting in main files via `cargo fmt`
Diffstat (limited to 'tests/git_remote_nostr')
-rw-r--r--tests/git_remote_nostr/main.rs2
-rw-r--r--tests/git_remote_nostr/push.rs30
2 files changed, 19 insertions, 13 deletions
diff --git a/tests/git_remote_nostr/main.rs b/tests/git_remote_nostr/main.rs
index 5a1d416..686a5df 100644
--- a/tests/git_remote_nostr/main.rs
+++ b/tests/git_remote_nostr/main.rs
@@ -4,7 +4,7 @@ use anyhow::{Context, Result};
4use futures::join; 4use futures::join;
5use git2::Oid; 5use git2::Oid;
6use nostr::nips::nip01::Coordinate; 6use nostr::nips::nip01::Coordinate;
7use nostr_sdk::{secp256k1::rand, Event, JsonUtil, Kind, RelayUrl, ToBech32}; 7use nostr_sdk::{Event, JsonUtil, Kind, RelayUrl, ToBech32, secp256k1::rand};
8use relay::Relay; 8use relay::Relay;
9use serial_test::serial; 9use serial_test::serial;
10use test_utils::{git::GitTestRepo, *}; 10use test_utils::{git::GitTestRepo, *};
diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs
index 30602c9..4e44642 100644
--- a/tests/git_remote_nostr/push.rs
+++ b/tests/git_remote_nostr/push.rs
@@ -925,10 +925,12 @@ async fn proposal_three_way_merge_commit_pushed_to_main_leads_to_status_event_is
925 std::fs::write(git_repo.dir.join("new.md"), "some content")?; 925 std::fs::write(git_repo.dir.join("new.md"), "some content")?;
926 git_repo.stage_and_commit("new.md")?; 926 git_repo.stage_and_commit("new.md")?;
927 927
928 CliTester::new_git_with_remote_helper_from_dir( 928 CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, [
929 &git_repo.dir, 929 "merge",
930 ["merge", &branch_name, "-m", "proposal merge commit message"], 930 &branch_name,
931 ) 931 "-m",
932 "proposal merge commit message",
933 ])
932 .expect_end_eventually_and_print()?; 934 .expect_end_eventually_and_print()?;
933 935
934 let oid = git_repo.get_tip_of_local_branch("main")?; 936 let oid = git_repo.get_tip_of_local_branch("main")?;
@@ -1079,10 +1081,12 @@ async fn proposal_fast_forward_merge_commits_pushed_to_main_leads_to_status_even
1079 git_repo.checkout_remote_branch(&branch_name)?; 1081 git_repo.checkout_remote_branch(&branch_name)?;
1080 git_repo.checkout("refs/heads/main")?; 1082 git_repo.checkout("refs/heads/main")?;
1081 1083
1082 CliTester::new_git_with_remote_helper_from_dir( 1084 CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, [
1083 &git_repo.dir, 1085 "merge",
1084 ["merge", &branch_name, "-m", "proposal merge commit message"], 1086 &branch_name,
1085 ) 1087 "-m",
1088 "proposal merge commit message",
1089 ])
1086 .expect_end_eventually_and_print()?; 1090 .expect_end_eventually_and_print()?;
1087 1091
1088 let oid = git_repo.get_tip_of_local_branch("main")?; 1092 let oid = git_repo.get_tip_of_local_branch("main")?;
@@ -1736,10 +1740,12 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> {
1736 std::fs::write(git_repo.dir.join("new2.md"), "some content")?; 1740 std::fs::write(git_repo.dir.join("new2.md"), "some content")?;
1737 git_repo.stage_and_commit("new2.md")?; 1741 git_repo.stage_and_commit("new2.md")?;
1738 1742
1739 let mut p = CliTester::new_git_with_remote_helper_from_dir( 1743 let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, [
1740 &git_repo.dir, 1744 "push",
1741 ["push", "-u", "origin", branch_name], 1745 "-u",
1742 ); 1746 "origin",
1747 branch_name,
1748 ]);
1743 cli_expect_nostr_fetch(&mut p)?; 1749 cli_expect_nostr_fetch(&mut p)?;
1744 p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?; 1750 p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?;
1745 p.expect("list: connecting...\r\n\r\r\r")?; 1751 p.expect("list: connecting...\r\n\r\r\r")?;