test: pass conv-params as a string instead of a YAML mapping

eduardosm · Aug 9, 2024 · dd2151a · dd2151a
1 parent 7030c39
commit dd2151a
Show file tree

Hide file tree

Showing 109 changed files with 110 additions and 111 deletions.
diff --git a/convert-tests/defs.rs b/convert-tests/defs.rs
@@ -12,7 +12,7 @@ pub(crate) struct Test {
     #[serde(rename = "svn-revs")]
     pub(crate) svn_revs: Vec<SvnRev>,
     #[serde(rename = "conv-params")]
-    pub(crate) conv_params: serde_yaml::Value,
+    pub(crate) conv_params: String,
     #[serde(rename = "user-map")]
     pub(crate) user_map: Option<String>,
     #[serde(rename = "git-repack", default = "false_")]

diff --git a/convert-tests/test.rs b/convert-tests/test.rs
@@ -24,8 +24,7 @@ pub(crate) fn run_test(test_path: &Path) -> Result<(), String> {
     }
 
     let conv_params_path = temp_dir.join("conv-params.yaml");
-    let conv_params_raw = serde_yaml::to_string(&test_def.conv_params).unwrap();
-    std::fs::write(&conv_params_path, conv_params_raw.as_bytes())
+    std::fs::write(&conv_params_path, test_def.conv_params.as_bytes())
         .map_err(|e| format!("failed to write {conv_params_path:?}: {e}"))?;
 
     let svn_dump_path = temp_dir.join("svn-dump");

diff --git a/convert-tests/tests/branches/branched-unbranched.yaml b/convert-tests/tests/branches/branched-unbranched.yaml
@@ -24,7 +24,7 @@ svn-revs:
         action: add
         text: "z\n"
 
-conv-params:
+conv-params: |
   branches:
    - trunk
 

diff --git a/convert-tests/tests/branches/copy-nonbranch-to-one.yaml b/convert-tests/tests/branches/copy-nonbranch-to-one.yaml
@@ -23,7 +23,7 @@ svn-revs:
         action: add
         copy-from-path: trunk
 
-conv-params:
+conv-params: |
   branches:
     - branches/*
   rename-branches:

diff --git a/convert-tests/tests/branches/copy-nonbranch-to-parent.yaml b/convert-tests/tests/branches/copy-nonbranch-to-parent.yaml
@@ -27,7 +27,7 @@ svn-revs:
         action: add
         copy-from-path: branches1
 
-conv-params:
+conv-params: |
   branches:
     - branches2/*
   head: branches2/b1

diff --git a/convert-tests/tests/branches/copy-one-to-nonbranch.yaml b/convert-tests/tests/branches/copy-one-to-nonbranch.yaml
@@ -23,7 +23,7 @@ svn-revs:
         action: add
         copy-from-path: trunk
 
-conv-params:
+conv-params: |
   branches:
     - trunk
   rename-branches:

diff --git a/convert-tests/tests/branches/copy-one.yaml b/convert-tests/tests/branches/copy-one.yaml
@@ -23,7 +23,7 @@ svn-revs:
         action: add
         copy-from-path: trunk
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/copy-parent-to-nonbranch.yaml b/convert-tests/tests/branches/copy-parent-to-nonbranch.yaml
@@ -27,7 +27,7 @@ svn-revs:
         action: add
         copy-from-path: branches1
 
-conv-params:
+conv-params: |
   branches:
     - branches1/*
   head: branches1/b1

diff --git a/convert-tests/tests/branches/copy-parent.yaml b/convert-tests/tests/branches/copy-parent.yaml
@@ -27,7 +27,7 @@ svn-revs:
         action: add
         copy-from-path: branches1
 
-conv-params:
+conv-params: |
   branches:
     - branches1/*
     - branches2/*

diff --git a/convert-tests/tests/branches/copy-replace-parent.yaml b/convert-tests/tests/branches/copy-replace-parent.yaml
@@ -41,7 +41,7 @@ svn-revs:
         action: replace
         copy-from-path: branches1
 
-conv-params:
+conv-params: |
   branches:
     - branches1/*
     - branches2/*

diff --git a/convert-tests/tests/branches/delete-keep.yaml b/convert-tests/tests/branches/delete-keep.yaml
@@ -19,7 +19,7 @@ svn-revs:
         kind: dir
         action: delete
 
-conv-params:
+conv-params: |
   branches:
     - trunk
 

diff --git a/convert-tests/tests/branches/delete-not-keep.yaml b/convert-tests/tests/branches/delete-not-keep.yaml
@@ -29,7 +29,7 @@ svn-revs:
         kind: dir
         action: delete
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/delete-twice.yaml b/convert-tests/tests/branches/delete-twice.yaml
@@ -35,7 +35,7 @@ svn-revs:
         kind: dir
         action: delete
 
-conv-params:
+conv-params: |
   branches:
     - trunk
 

diff --git a/convert-tests/tests/branches/merge-after-cherrypick.yaml b/convert-tests/tests/branches/merge-after-cherrypick.yaml
@@ -74,7 +74,7 @@ svn-revs:
         action: add
         text: "file D\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/merge-allowed-gap.yaml b/convert-tests/tests/branches/merge-allowed-gap.yaml
@@ -50,7 +50,7 @@ svn-revs:
         action: add
         text: "file B\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/merge-and-keep.yaml b/convert-tests/tests/branches/merge-and-keep.yaml
@@ -60,7 +60,7 @@ svn-revs:
         action: add
         text: "file D\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/merge-and-revert-keep.yaml b/convert-tests/tests/branches/merge-and-revert-keep.yaml
@@ -60,7 +60,7 @@ svn-revs:
         kind: file
         action: delete
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/merge-and-revert-not-keep.yaml b/convert-tests/tests/branches/merge-and-revert-not-keep.yaml
@@ -60,7 +60,7 @@ svn-revs:
         kind: file
         action: delete
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/merge-during-create.yaml b/convert-tests/tests/branches/merge-during-create.yaml
@@ -51,7 +51,7 @@ svn-revs:
         action: add
         text: "file C\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/merge-simple-ignore.yaml b/convert-tests/tests/branches/merge-simple-ignore.yaml
@@ -50,7 +50,7 @@ svn-revs:
         action: add
         text: "file C\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/merge-simple.yaml b/convert-tests/tests/branches/merge-simple.yaml
@@ -50,7 +50,7 @@ svn-revs:
         action: add
         text: "file C\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/merge-twice.yaml b/convert-tests/tests/branches/merge-twice.yaml
@@ -63,7 +63,7 @@ svn-revs:
         action: add
         text: "file C\n"
 
-conv-params:
+conv-params: |
   branches:
   - trunk
   - branches/*

diff --git a/convert-tests/tests/branches/merge-with-cherrypick.yaml b/convert-tests/tests/branches/merge-with-cherrypick.yaml
@@ -89,7 +89,7 @@ svn-revs:
         action: add
         text: "file E\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/not-merge-gap.yaml b/convert-tests/tests/branches/not-merge-gap.yaml
@@ -50,7 +50,7 @@ svn-revs:
         action: add
         text: "file C\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - branches/*

diff --git a/convert-tests/tests/branches/recover-one.yaml b/convert-tests/tests/branches/recover-one.yaml
@@ -24,7 +24,7 @@ svn-revs:
         copy-from-rev: 1
         copy-from-path: trunk
 
-conv-params:
+conv-params: |
   branches:
     - trunk
     - trunk2

diff --git a/convert-tests/tests/branches/recover-parent.yaml b/convert-tests/tests/branches/recover-parent.yaml
@@ -34,7 +34,7 @@ svn-revs:
         copy-from-rev: 1
         copy-from-path: branches1
 
-conv-params:
+conv-params: |
   branches:
     - branches1/*
     - branches2/*

diff --git a/convert-tests/tests/branches/recreate.yaml b/convert-tests/tests/branches/recreate.yaml
@@ -26,7 +26,7 @@ svn-revs:
         action: add
         text: "y\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
 

diff --git a/convert-tests/tests/branches/unbranched-custom.yaml b/convert-tests/tests/branches/unbranched-custom.yaml
@@ -14,7 +14,7 @@ svn-revs:
         action: add
         text: "y\n"
 
-conv-params:
+conv-params: |
   head: ""
   unbranched-name: onebranch
 

diff --git a/convert-tests/tests/commit-meta/custom.yaml b/convert-tests/tests/commit-meta/custom.yaml
@@ -25,7 +25,7 @@ svn-revs:
         action: add
         text: "y\n"
 
-conv-params:
+conv-params: |
   branches:
    - trunk
   user-map-file: user-map.txt

diff --git a/convert-tests/tests/commit-meta/default.yaml b/convert-tests/tests/commit-meta/default.yaml
@@ -34,7 +34,7 @@ svn-revs:
         action: change
         text: "z\n"
 
-conv-params:
+conv-params: |
   branches:
    - trunk
 

diff --git a/convert-tests/tests/copy-root.yaml b/convert-tests/tests/copy-root.yaml
@@ -27,7 +27,7 @@ svn-revs:
         action: add
         copy-from-path: ""
 
-conv-params:
+conv-params: |
   branches:
     - branches/*
     - backup/branches/*

diff --git a/convert-tests/tests/delete-files-branched.yaml b/convert-tests/tests/delete-files-branched.yaml
@@ -21,7 +21,7 @@ svn-revs:
         action: add
         copy-from-path: trunk/y
 
-conv-params:
+conv-params: |
   branches:
     - trunk
   delete-files:

diff --git a/convert-tests/tests/delete-files-unbranched.yaml b/convert-tests/tests/delete-files-unbranched.yaml
@@ -18,7 +18,7 @@ svn-revs:
         action: add
         copy-from-path: y
 
-conv-params:
+conv-params: |
   head: ""
   delete-files:
     - "**/y"

diff --git a/convert-tests/tests/dump-sources/compressed-bzip2.yaml b/convert-tests/tests/dump-sources/compressed-bzip2.yaml
@@ -19,7 +19,7 @@ svn-revs:
         action: add
         text: "y\n"
 
-conv-params:
+conv-params: |
   branches:
    - trunk
 

diff --git a/convert-tests/tests/dump-sources/compressed-gzip.yaml b/convert-tests/tests/dump-sources/compressed-gzip.yaml
@@ -19,7 +19,7 @@ svn-revs:
         action: add
         text: "y\n"
 
-conv-params:
+conv-params: |
   branches:
    - trunk
 

diff --git a/convert-tests/tests/dump-sources/compressed-lz4.yaml b/convert-tests/tests/dump-sources/compressed-lz4.yaml
@@ -19,7 +19,7 @@ svn-revs:
         action: add
         text: "y\n"
 
-conv-params:
+conv-params: |
   branches:
    - trunk
 

diff --git a/convert-tests/tests/dump-sources/compressed-xz.yaml b/convert-tests/tests/dump-sources/compressed-xz.yaml
@@ -19,7 +19,7 @@ svn-revs:
         action: add
         text: "y\n"
 
-conv-params:
+conv-params: |
   branches:
    - trunk
 

diff --git a/convert-tests/tests/dump-sources/compressed-zstd.yaml b/convert-tests/tests/dump-sources/compressed-zstd.yaml
@@ -19,7 +19,7 @@ svn-revs:
         action: add
         text: "y\n"
 
-conv-params:
+conv-params: |
   branches:
    - trunk
 

diff --git a/convert-tests/tests/dump-sources/uncompressed.yaml b/convert-tests/tests/dump-sources/uncompressed.yaml
@@ -19,7 +19,7 @@ svn-revs:
         action: add
         text: "y\n"
 
-conv-params:
+conv-params: |
   branches:
    - trunk
 

diff --git a/convert-tests/tests/fail/change-non-existing-file.yaml b/convert-tests/tests/fail/change-non-existing-file.yaml
@@ -13,7 +13,7 @@ svn-revs:
         action: change
         text: "x\n"
 
-conv-params:
+conv-params: |
   branches:
     - trunk
 

diff --git a/convert-tests/tests/fail/copy-file-as-dir.yaml b/convert-tests/tests/fail/copy-file-as-dir.yaml
@@ -17,7 +17,7 @@ svn-revs:
         action: add
         copy-from-path: trunk/x
 
-conv-params:
+conv-params: |
   branches:
     - trunk
 

diff --git a/convert-tests/tests/fail/copy-from-non-existing-path.yaml b/convert-tests/tests/fail/copy-from-non-existing-path.yaml
@@ -14,7 +14,7 @@ svn-revs:
         copy-from-rev: 1
         copy-from-path: trunk/y
 
-conv-params:
+conv-params: |
   branches:
     - trunk
 

diff --git a/convert-tests/tests/fail/copy-from-non-existing-rev.yaml b/convert-tests/tests/fail/copy-from-non-existing-rev.yaml
@@ -14,7 +14,7 @@ svn-revs:
         copy-from-rev: 3
         copy-from-path: trunk/y
 
-conv-params:
+conv-params: |
   branches:
     - trunk
 

diff --git a/convert-tests/tests/fail/delete-non-existing-file.yaml b/convert-tests/tests/fail/delete-non-existing-file.yaml
@@ -12,7 +12,7 @@ svn-revs:
         kind: file
         action: delete
 
-conv-params:
+conv-params: |
   branches:
     - trunk