Merge pull request #400 from Leonidas-from-XIV/dune-cram-tests

Port `mdx` tests to `cram` tests

Author: Leonidas-from-XIV

dune-project

@@ -1,7 +1,6 @@
 (lang dune 2.7)
 (name dune-release)
 
-(using mdx 0.1)
 (cram enable)
 
 (generate_opam_files true)
@@ -40,5 +39,4 @@ with [Dune](https://github.com/ocaml/dune) and hosted on
   logs
   odoc
   (alcotest :with-test)
-  (mdx (and :with-test (>= 1.6.0)))
   (yojson (>= 1.6))))

dune-release.opam

@@ -34,7 +34,6 @@ depends: [
   "logs"
   "odoc"
   "alcotest" {with-test}
-  "mdx" {with-test & >= "1.6.0"}
   "yojson" {>= "1.6"}
 ]
 build: [

lib/lint.ml

@@ -211,7 +211,7 @@ let lint_pkg ~dry_run ~dir ~pkg_name pkg todo =
     match total_errs with
     | 0 ->
         Logs.app (fun m ->
-            m "%a lint of %a and package %a %a " Text.Pp.status `Ok Text.Pp.path
+            m "%a lint of %a and package %a %a" Text.Pp.status `Ok Text.Pp.path
               dir pp_pkg_name pkg_name
               (Fmt.styled `Green Fmt.(any "success"))
               ());

lib/sos.ml

@@ -70,7 +70,7 @@ let cmd_error cmd err_msg status =
       R.error_msgf "The following command exited with signal %d:@\n  %a" c
         Cmd.pp cmd
   | Some err_msg, `Exited c ->
-      R.error_msgf "Exit code %d from command @\n  `%a`:@\n%s" c Cmd.pp cmd
+      R.error_msgf "Exit code %d from command@\n  `%a`:@\n%s" c Cmd.pp cmd
         err_msg
   | Some err_msg, `Signaled c ->
       R.error_msgf "Signal %d from command @\n  `%a`:@\n%s" c Cmd.pp cmd err_msg

tests/bin/check/dune

@@ -1,7 +1,8 @@
 (env
  (_
   (binaries
-   (../helpers/make_check_deterministic.exe as make_check_deterministic))))
+   (../helpers/make_dune_release_deterministic.exe as
+     make_dune_release_deterministic))))
 
 (cram
- (deps %{bin:dune-release} %{bin:make_check_deterministic}))
+ (deps %{bin:dune-release} %{bin:make_dune_release_deterministic}))

tests/bin/check/run.t

@@ -27,7 +27,7 @@ Make a minimal project set up
 
 If the condition described above is fulfilled, there are 4 checks to be performed
 
-  $ dune-release check --working-tree | make_check_deterministic
+  $ dune-release check --working-tree | make_dune_release_deterministic
   [-] Checking dune-release compatibility.
   [ OK ] The dev-repo field of my_pkg.opam contains a github uri.
   [ OK ] The dune project contains a name stanza.
@@ -64,7 +64,7 @@ Add another package
 
 In multi package projects, the whole lint process (including the file lints, even though they are package independent) is done once for every package
 
-  $ dune-release check --working-tree | make_check_deterministic
+  $ dune-release check --working-tree | make_dune_release_deterministic
   [-] Checking dune-release compatibility.
   [ OK ] The dev-repo field of my_pkg.opam contains a github uri.
   [ OK ] The dune project contains a name stanza.
@@ -99,7 +99,7 @@ In multi package projects, the whole lint process (including the file lints, eve
 
 In the same way in which the user can skip the lint check when releasing the tarball, they can also skip it here
 
-  $ dune-release check --working-tree --skip-lint | make_check_deterministic
+  $ dune-release check --working-tree --skip-lint | make_dune_release_deterministic
   [-] Checking dune-release compatibility.
   [ OK ] The dev-repo field of my_pkg.opam contains a github uri.
   [ OK ] The dune project contains a name stanza.
@@ -112,7 +112,7 @@ In the same way in which the user can skip the lint check when releasing the tar
 
 Same for skipping the tests
 
-  $ dune-release check --working-tree --skip-lint --skip-test | make_check_deterministic
+  $ dune-release check --working-tree --skip-lint --skip-test | make_dune_release_deterministic
   [-] Checking dune-release compatibility.
   [ OK ] The dev-repo field of my_pkg.opam contains a github uri.
   [ OK ] The dune project contains a name stanza.

tests/bin/delegate-info/dune

@@ -0,0 +1,2 @@
+(cram
+ (deps %{bin:dune-release}))

tests/bin/delegate-info/run.t

@@ -0,0 +1,44 @@
+We need a basic opam project skeleton
+
+  $ cat > CHANGES.md << EOF
+  > ## 0.1.0
+  > 
+  > - Some other feature
+  > 
+  > ## 0.0.0
+  > 
+  > - Some feature
+  > EOF
+  $ touch whatever.opam
+  $ cat > dune-project << EOF
+  > (lang dune 2.4)
+  > (name whatever)
+  > EOF
+
+We need to set up a git project for dune-release to work properly
+
+  $ git init 2> /dev/null > /dev/null
+  $ git config user.name "dune-release-test"
+  $ git config user.email "pseudo@pseudo.invalid"
+  $ git add CHANGES.md whatever.opam dune-project
+  $ git commit -m "Initial commit" > /dev/null
+  $ dune-release tag -y > /dev/null
+
+Dune-release delegate-info tarball should print the path to the tarball:
+
+  $ dune-release delegate-info tarball
+  _build/whatever-0.1.0.tbz
+
+Dune-release delegate-info docdir should print the path to the docdir:
+
+  $ dune-release delegate-info docdir
+  _build/default/_doc/_html
+
+Dune-release delegate-info publication-message should print the publication-message:
+
+  $ dune-release delegate-info publication-message
+  CHANGES:
+  
+  - Some other feature
+  
+