Skip to content

Commit 3dc1848

Browse files
authored
crates_io_tarball: Extract constants (#8787)
* crates_io_tarball: Extract `MANIFEST` constant * crates_io_tarball: Extract `MAX_SIZE` constant
1 parent ba7b73a commit 3dc1848

File tree

1 file changed

+20
-59
lines changed
  • crates/crates_io_tarball/src

1 file changed

+20
-59
lines changed

crates/crates_io_tarball/src/lib.rs

+20-59
Original file line numberDiff line numberDiff line change
@@ -146,49 +146,43 @@ mod tests {
146146
use cargo_manifest::{MaybeInherited, StringOrBool};
147147
use insta::assert_snapshot;
148148

149+
const MANIFEST: &[u8] = b"[package]\nname = \"foo\"\nversion = \"0.0.1\"\n";
150+
const MAX_SIZE: u64 = 512 * 1024 * 1024;
151+
149152
#[test]
150153
fn process_tarball_test() {
151-
let manifest = b"[package]\nname = \"foo\"\nversion = \"0.0.1\"\n";
152154
let tarball = TarballBuilder::new()
153-
.add_file("foo-0.0.1/Cargo.toml", manifest)
155+
.add_file("foo-0.0.1/Cargo.toml", MANIFEST)
154156
.build();
155157

156-
let limit = 512 * 1024 * 1024;
157-
158-
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, limit));
158+
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, MAX_SIZE));
159159
assert_none!(tarball_info.vcs_info);
160160

161-
let err = assert_err!(process_tarball("bar-0.0.1", &*tarball, limit));
161+
let err = assert_err!(process_tarball("bar-0.0.1", &*tarball, MAX_SIZE));
162162
assert_snapshot!(err, @"invalid path found: foo-0.0.1/Cargo.toml");
163163
}
164164

165165
#[test]
166166
fn process_tarball_test_incomplete_vcs_info() {
167-
let manifest = b"[package]\nname = \"foo\"\nversion = \"0.0.1\"\n";
168167
let tarball = TarballBuilder::new()
169-
.add_file("foo-0.0.1/Cargo.toml", manifest)
168+
.add_file("foo-0.0.1/Cargo.toml", MANIFEST)
170169
.add_file("foo-0.0.1/.cargo_vcs_info.json", br#"{"unknown": "field"}"#)
171170
.build();
172171

173-
let limit = 512 * 1024 * 1024;
174-
175-
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, limit));
172+
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, MAX_SIZE));
176173
let vcs_info = assert_some!(tarball_info.vcs_info);
177174
assert_eq!(vcs_info.path_in_vcs, "");
178175
}
179176

180177
#[test]
181178
fn process_tarball_test_vcs_info() {
182-
let manifest = b"[package]\nname = \"foo\"\nversion = \"0.0.1\"\n";
183179
let vcs_info = br#"{"path_in_vcs": "path/in/vcs"}"#;
184180
let tarball = TarballBuilder::new()
185-
.add_file("foo-0.0.1/Cargo.toml", manifest)
181+
.add_file("foo-0.0.1/Cargo.toml", MANIFEST)
186182
.add_file("foo-0.0.1/.cargo_vcs_info.json", vcs_info)
187183
.build();
188184

189-
let limit = 512 * 1024 * 1024;
190-
191-
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, limit));
185+
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, MAX_SIZE));
192186
let vcs_info = assert_some!(tarball_info.vcs_info);
193187
assert_eq!(vcs_info.path_in_vcs, "path/in/vcs");
194188
}
@@ -207,9 +201,7 @@ mod tests {
207201
.add_file("foo-0.0.1/Cargo.toml", manifest)
208202
.build();
209203

210-
let limit = 512 * 1024 * 1024;
211-
212-
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, limit));
204+
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, MAX_SIZE));
213205
let package = assert_some!(tarball_info.manifest.package);
214206
assert_matches!(package.readme, Some(MaybeInherited::Local(StringOrBool::String(s))) if s == "README.md");
215207
assert_matches!(package.repository, Some(MaybeInherited::Local(s)) if s == "https://github.com/foo/bar");
@@ -228,27 +220,18 @@ mod tests {
228220
.add_file("foo-0.0.1/Cargo.toml", manifest)
229221
.build();
230222

231-
let limit = 512 * 1024 * 1024;
232-
233-
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, limit));
223+
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, MAX_SIZE));
234224
let package = assert_some!(tarball_info.manifest.package);
235225
assert_matches!(package.rust_version, Some(MaybeInherited::Local(s)) if s == "1.23");
236226
}
237227

238228
#[test]
239229
fn process_tarball_test_manifest_with_default_readme() {
240-
let manifest = br#"
241-
[package]
242-
name = "foo"
243-
version = "0.0.1"
244-
"#;
245230
let tarball = TarballBuilder::new()
246-
.add_file("foo-0.0.1/Cargo.toml", manifest)
231+
.add_file("foo-0.0.1/Cargo.toml", MANIFEST)
247232
.build();
248233

249-
let limit = 512 * 1024 * 1024;
250-
251-
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, limit));
234+
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, MAX_SIZE));
252235
let package = assert_some!(tarball_info.manifest.package);
253236
assert_none!(package.readme);
254237
}
@@ -265,9 +248,7 @@ mod tests {
265248
.add_file("foo-0.0.1/Cargo.toml", manifest)
266249
.build();
267250

268-
let limit = 512 * 1024 * 1024;
269-
270-
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, limit));
251+
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, MAX_SIZE));
271252
let package = assert_some!(tarball_info.manifest.package);
272253
assert_matches!(package.readme, Some(MaybeInherited::Local(StringOrBool::Bool(b))) if !b);
273254
}
@@ -284,30 +265,19 @@ mod tests {
284265
.add_file("foo-0.0.1/cargo.toml", manifest)
285266
.build();
286267

287-
let limit = 512 * 1024 * 1024;
288-
289-
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, limit));
268+
let tarball_info = assert_ok!(process_tarball("foo-0.0.1", &*tarball, MAX_SIZE));
290269
let package = assert_some!(tarball_info.manifest.package);
291270
assert_matches!(package.repository, Some(MaybeInherited::Local(s)) if s == "https://github.com/foo/bar");
292271
}
293272

294273
#[test]
295274
fn process_tarball_test_incorrect_manifest_casing() {
296-
let manifest = br#"
297-
[package]
298-
name = "foo"
299-
version = "0.0.1"
300-
repository = "https://github.com/foo/bar"
301-
"#;
302-
303-
let limit = 512 * 1024 * 1024;
304-
305275
let process = |file: &str| {
306276
let tarball = TarballBuilder::new()
307-
.add_file(&format!("foo-0.0.1/{file}"), manifest)
277+
.add_file(&format!("foo-0.0.1/{file}"), MANIFEST)
308278
.build();
309279

310-
process_tarball("foo-0.0.1", &*tarball, limit)
280+
process_tarball("foo-0.0.1", &*tarball, MAX_SIZE)
311281
};
312282

313283
let err = assert_err!(process("CARGO.TOML"));
@@ -319,24 +289,15 @@ mod tests {
319289

320290
#[test]
321291
fn process_tarball_test_multiple_manifests() {
322-
let manifest = br#"
323-
[package]
324-
name = "foo"
325-
version = "0.0.1"
326-
repository = "https://github.com/foo/bar"
327-
"#;
328-
329-
let limit = 512 * 1024 * 1024;
330-
331292
let process = |files: Vec<&str>| {
332293
let tarball = files
333294
.iter()
334295
.fold(TarballBuilder::new(), |builder, file| {
335-
builder.add_file(&format!("foo-0.0.1/{file}"), manifest)
296+
builder.add_file(&format!("foo-0.0.1/{file}"), MANIFEST)
336297
})
337298
.build();
338299

339-
process_tarball("foo-0.0.1", &*tarball, limit)
300+
process_tarball("foo-0.0.1", &*tarball, MAX_SIZE)
340301
};
341302

342303
let err = assert_err!(process(vec!["cargo.toml", "Cargo.toml"]));

0 commit comments

Comments
 (0)