diff options
Diffstat (limited to 'tests/git_remote_helper.rs')
| -rw-r--r-- | tests/git_remote_helper.rs | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs index a44b141..07f9ec8 100644 --- a/tests/git_remote_helper.rs +++ b/tests/git_remote_helper.rs | |||
| @@ -1730,6 +1730,7 @@ mod push { | |||
| 1730 | r51.events = events.clone(); | 1730 | r51.events = events.clone(); |
| 1731 | r55.events = events.clone(); | 1731 | r55.events = events.clone(); |
| 1732 | 1732 | ||
| 1733 | #[allow(clippy::mutable_key_type)] | ||
| 1733 | let before = r55.events.iter().cloned().collect::<HashSet<Event>>(); | 1734 | let before = r55.events.iter().cloned().collect::<HashSet<Event>>(); |
| 1734 | 1735 | ||
| 1735 | let cli_tester_handle = std::thread::spawn(move || -> Result<(String, Oid)> { | 1736 | let cli_tester_handle = std::thread::spawn(move || -> Result<(String, Oid)> { |
| @@ -1798,7 +1799,8 @@ mod push { | |||
| 1798 | .events | 1799 | .events |
| 1799 | .iter() | 1800 | .iter() |
| 1800 | .find(|e| { | 1801 | .find(|e| { |
| 1801 | e.iter_tags() | 1802 | e.tags() |
| 1803 | .iter() | ||
| 1802 | .find(|t| t.as_vec()[0].eq("branch-name")) | 1804 | .find(|t| t.as_vec()[0].eq("branch-name")) |
| 1803 | .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1)) | 1805 | .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1)) |
| 1804 | }) | 1806 | }) |
| @@ -1824,7 +1826,8 @@ mod push { | |||
| 1824 | .events | 1826 | .events |
| 1825 | .iter() | 1827 | .iter() |
| 1826 | .filter(|e| { | 1828 | .filter(|e| { |
| 1827 | e.iter_tags() | 1829 | e.tags() |
| 1830 | .iter() | ||
| 1828 | .any(|t| t.as_vec()[1].eq(&proposal.id().to_string())) | 1831 | .any(|t| t.as_vec()[1].eq(&proposal.id().to_string())) |
| 1829 | && e.kind().eq(&Kind::GitPatch) | 1832 | && e.kind().eq(&Kind::GitPatch) |
| 1830 | }) | 1833 | }) |
| @@ -1877,6 +1880,7 @@ mod push { | |||
| 1877 | r51.events = events.clone(); | 1880 | r51.events = events.clone(); |
| 1878 | r55.events = events.clone(); | 1881 | r55.events = events.clone(); |
| 1879 | 1882 | ||
| 1883 | #[allow(clippy::mutable_key_type)] | ||
| 1880 | let before = r55.events.iter().cloned().collect::<HashSet<Event>>(); | 1884 | let before = r55.events.iter().cloned().collect::<HashSet<Event>>(); |
| 1881 | 1885 | ||
| 1882 | let cli_tester_handle = std::thread::spawn(move || -> Result<(String, String)> { | 1886 | let cli_tester_handle = std::thread::spawn(move || -> Result<(String, String)> { |
| @@ -1950,7 +1954,8 @@ mod push { | |||
| 1950 | .events | 1954 | .events |
| 1951 | .iter() | 1955 | .iter() |
| 1952 | .find(|e| { | 1956 | .find(|e| { |
| 1953 | e.iter_tags() | 1957 | e.tags() |
| 1958 | .iter() | ||
| 1954 | .find(|t| t.as_vec()[0].eq("branch-name")) | 1959 | .find(|t| t.as_vec()[0].eq("branch-name")) |
| 1955 | .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1)) | 1960 | .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1)) |
| 1956 | }) | 1961 | }) |
| @@ -1982,7 +1987,8 @@ mod push { | |||
| 1982 | .events | 1987 | .events |
| 1983 | .iter() | 1988 | .iter() |
| 1984 | .find(|e| { | 1989 | .find(|e| { |
| 1985 | e.iter_tags() | 1990 | e.tags() |
| 1991 | .iter() | ||
| 1986 | .any(|t| t.as_vec()[1].eq(&proposal.id().to_string())) | 1992 | .any(|t| t.as_vec()[1].eq(&proposal.id().to_string())) |
| 1987 | && e.content.contains("[PATCH 2/2]") | 1993 | && e.content.contains("[PATCH 2/2]") |
| 1988 | }) | 1994 | }) |
| @@ -2019,6 +2025,7 @@ mod push { | |||
| 2019 | r51.events = events.clone(); | 2025 | r51.events = events.clone(); |
| 2020 | r55.events = events.clone(); | 2026 | r55.events = events.clone(); |
| 2021 | 2027 | ||
| 2028 | #[allow(clippy::mutable_key_type)] | ||
| 2022 | let before = r55.events.iter().cloned().collect::<HashSet<Event>>(); | 2029 | let before = r55.events.iter().cloned().collect::<HashSet<Event>>(); |
| 2023 | 2030 | ||
| 2024 | let cli_tester_handle = std::thread::spawn(move || -> Result<(String, String)> { | 2031 | let cli_tester_handle = std::thread::spawn(move || -> Result<(String, String)> { |
| @@ -2086,7 +2093,8 @@ mod push { | |||
| 2086 | .events | 2093 | .events |
| 2087 | .iter() | 2094 | .iter() |
| 2088 | .find(|e| { | 2095 | .find(|e| { |
| 2089 | e.iter_tags() | 2096 | e.tags() |
| 2097 | .iter() | ||
| 2090 | .find(|t| t.as_vec()[0].eq("branch-name")) | 2098 | .find(|t| t.as_vec()[0].eq("branch-name")) |
| 2091 | .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1)) | 2099 | .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1)) |
| 2092 | }) | 2100 | }) |
| @@ -2094,7 +2102,7 @@ mod push { | |||
| 2094 | 2102 | ||
| 2095 | let revision_root_patch = new_events | 2103 | let revision_root_patch = new_events |
| 2096 | .iter() | 2104 | .iter() |
| 2097 | .find(|e| e.iter_tags().any(|t| t.as_vec()[1].eq("revision-root"))) | 2105 | .find(|e| e.tags().iter().any(|t| t.as_vec()[1].eq("revision-root"))) |
| 2098 | .unwrap(); | 2106 | .unwrap(); |
| 2099 | 2107 | ||
| 2100 | assert_eq!( | 2108 | assert_eq!( |
| @@ -2172,6 +2180,7 @@ mod push { | |||
| 2172 | r51.events = events.clone(); | 2180 | r51.events = events.clone(); |
| 2173 | r55.events = events.clone(); | 2181 | r55.events = events.clone(); |
| 2174 | 2182 | ||
| 2183 | #[allow(clippy::mutable_key_type)] | ||
| 2175 | let before = r55.events.iter().cloned().collect::<HashSet<Event>>(); | 2184 | let before = r55.events.iter().cloned().collect::<HashSet<Event>>(); |
| 2176 | let branch_name = "pr/my-new-proposal"; | 2185 | let branch_name = "pr/my-new-proposal"; |
| 2177 | 2186 | ||
| @@ -2231,7 +2240,7 @@ mod push { | |||
| 2231 | 2240 | ||
| 2232 | let proposal = new_events | 2241 | let proposal = new_events |
| 2233 | .iter() | 2242 | .iter() |
| 2234 | .find(|e| e.iter_tags().any(|t| t.as_vec()[1].eq("root"))) | 2243 | .find(|e| e.tags().iter().any(|t| t.as_vec()[1].eq("root"))) |
| 2235 | .unwrap(); | 2244 | .unwrap(); |
| 2236 | 2245 | ||
| 2237 | assert!( | 2246 | assert!( |
| @@ -2246,7 +2255,8 @@ mod push { | |||
| 2246 | 2255 | ||
| 2247 | assert_eq!( | 2256 | assert_eq!( |
| 2248 | proposal | 2257 | proposal |
| 2249 | .iter_tags() | 2258 | .tags() |
| 2259 | .iter() | ||
| 2250 | .find(|t| t.as_vec()[0].eq("branch-name")) | 2260 | .find(|t| t.as_vec()[0].eq("branch-name")) |
| 2251 | .unwrap() | 2261 | .unwrap() |
| 2252 | .as_vec()[1], | 2262 | .as_vec()[1], |