From f58e69f6ca68414f495cb61c5f591ef834ecfcdc Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 4 Apr 2024 00:38:53 -0500 Subject: [PATCH] cli: add another test for `snapshot.max-new-file-size` This one just tests with a larger value and a human-readable string (10KB). Signed-off-by: Austin Seipp Change-Id: If9e5d62146b369d3a1b7efe4e56a1b6b4338c720 --- cli/tests/test_working_copy.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cli/tests/test_working_copy.rs b/cli/tests/test_working_copy.rs index a45d4f506..14a4486fc 100644 --- a/cli/tests/test_working_copy.rs +++ b/cli/tests/test_working_copy.rs @@ -20,6 +20,8 @@ fn test_snapshot_large_file() { test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]); let repo_path = test_env.env_root().join("repo"); + // test a small file using raw-integer-literal syntax, which is interpreted + // in bytes test_env.add_config(r#"snapshot.max-new-file-size = 10"#); std::fs::write(repo_path.join("large"), "a lot of text").unwrap(); let stderr = test_env.jj_cmd_failure(&repo_path, &["files"]); @@ -33,4 +35,20 @@ fn test_snapshot_large_file() { - Run `jj --config-toml 'snapshot.max-new-file-size=13' st` This will increase the maximum file size allowed for new files, for this command only. "###); + + // test with a larger file using 'KB' human-readable syntax + test_env.add_config(r#"snapshot.max-new-file-size = "10KB""#); + let big_string = vec![0; 1024 * 11]; + std::fs::write(repo_path.join("large"), big_string).unwrap(); + let stderr = test_env.jj_cmd_failure(&repo_path, &["files"]); + insta::assert_snapshot!(stderr, @r###" + Error: Failed to snapshot the working copy + The file '$TEST_ENV/repo/large' is too large to be snapshotted: it is 1024 bytes too large; the maximum size allowed is 10240 bytes (10.0KiB). + Hint: This is to prevent large files from being added on accident. You can fix this error by: + - Adding the file to `.gitignore` + - Run `jj config set --repo snapshot.max-new-file-size 11264` + This will increase the maximum file size allowed for new files, in this repository only. + - Run `jj --config-toml 'snapshot.max-new-file-size=11264' st` + This will increase the maximum file size allowed for new files, for this command only. + "###); }