Hello community, here is the log from the commit of package ocaml-ounit for openSUSE:Factory checked in at 2020-08-24 15:08:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-ounit (Old) and /work/SRC/openSUSE:Factory/.ocaml-ounit.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-ounit" Mon Aug 24 15:08:26 2020 rev:4 rq:828700 version:2.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-ounit/ocaml-ounit.changes 2020-03-09 14:18:20.710702837 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-ounit.new.3399/ocaml-ounit.changes 2020-08-24 15:09:03.434568158 +0200 @@ -1,0 +2,6 @@ +Thu Aug 20 20:20:20 UTC 2020 - [email protected] + +- Update to version 2.2.3 + Increase timeouts for slow architecture + +------------------------------------------------------------------- Old: ---- ocaml-ounit-2.2.2.tar.xz New: ---- ocaml-ounit-2.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-ounit.spec ++++++ --- /var/tmp/diff_new_pack.SnzpSK/_old 2020-08-24 15:09:04.362568610 +0200 +++ /var/tmp/diff_new_pack.SnzpSK/_new 2020-08-24 15:09:04.366568612 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-ounit # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,17 +19,17 @@ %bcond_with ocaml_lwt Name: ocaml-ounit -Version: 2.2.2 +Version: 2.2.3 Release: 0 %{?ocaml_preserve_bytecode} Summary: Ocaml OUnit test framework License: MIT Group: Development/Languages/OCaml -Url: https://github.com/gildor478/ounit +URL: https://opam.ocaml.org/packages/ounit Source0: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20200220 +BuildRequires: ocaml-rpm-macros >= 20200514 BuildRequires: ocamlfind(bytes) BuildRequires: ocamlfind(stdlib-shims) BuildRequires: ocamlfind(str) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.SnzpSK/_old 2020-08-24 15:09:04.402568630 +0200 +++ /var/tmp/diff_new_pack.SnzpSK/_new 2020-08-24 15:09:04.402568630 +0200 @@ -1,10 +1,13 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">https://github.com/gildor478/ounit.git</param> - <param name="scm">git</param> - <param name="versionformat">2.2.2</param> - <param name="revision">v2.2.2</param> <param name="filename">ocaml-ounit</param> + <param name="revision">84086bd161e400a99e5cb9cf14b2eabb19ad32de</param> + <param name="scm">git</param> + <param name="submodules">disable</param> + <param name="url">https://github.com/gildor478/ounit.git</param> + <param name="versionformat">@PARENT_TAG@</param> + <param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param> + <param name="versionrewrite-replacement">\1</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ ocaml-ounit-2.2.2.tar.xz -> ocaml-ounit-2.2.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/.travis.yml new/ocaml-ounit-2.2.3/.travis.yml --- old/ocaml-ounit-2.2.2/.travis.yml 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/.travis.yml 2020-07-11 17:47:08.000000000 +0200 @@ -4,54 +4,53 @@ script: bash -ex .travis-opam.sh env: global: - # TODO: remove version on the pins. - - OUNIT_CI=true PINS="ounit.2.1.2:. ounit-lwt.2.1.2:. ounit2.2.1.2:. ounit2-lwt.2.1.2:." + - OUNIT_CI=true matrix: include: - name: "ounit: linux" os: linux - env: OCAML_VERSION=4.08 PACKAGE="ounit" + env: OCAML_VERSION=4.10 PACKAGE="ounit" - name: "ounit-lwt: linux" os: linux - env: OCAML_VERSION=4.08 PACKAGE="ounit-lwt" + env: OCAML_VERSION=4.10 PACKAGE="ounit-lwt" - name: "ounit2: linux" apt: packages: - libxml2-utils os: linux - env: OCAML_VERSION=4.08 PACKAGE="ounit2" + env: OCAML_VERSION=4.10 PACKAGE="ounit2" - name: "ounit2-lwt: linux" os: linux - env: OCAML_VERSION=4.08 PACKAGE="ounit2-lwt" + env: OCAML_VERSION=4.10 PACKAGE="ounit2-lwt" - name: "ounit2: reverse dependencies with linux" os: linux - env: OCAML_VERSION=4.08 PACKAGE="ounit2" REVDEPS="mock-ounit junit_ounit pa_ounit qcheck-ounit" POST_INSTALL_HOOK="opam install -t fileutils" + env: OCAML_VERSION=4.10 PACKAGE="ounit2" REVDEPS="mock-ounit junit_ounit pa_ounit qcheck-ounit" POST_INSTALL_HOOK="opam install -t fileutils" - name: "ounit2: old ocaml release with linux" os: linux - env: OCAML_VERSION=4.02 PACKAGE="ounit2" + env: OCAML_VERSION=4.04 PACKAGE="ounit2" - name: "ounit: MacOSX" os: osx - env: OCAML_VERSION=4.08 PACKAGE="ounit" REVDEPS="junit_ounit" + env: OCAML_VERSION=4.10 PACKAGE="ounit" REVDEPS="junit_ounit" cache: directories: - $HOME/Library/Caches/Homebrew - name: "ounit2: MacOSX" os: osx - env: OCAML_VERSION=4.08 PACKAGE="ounit2" REVDEPS="junit_ounit" + env: OCAML_VERSION=4.10 PACKAGE="ounit2" REVDEPS="junit_ounit" cache: directories: - $HOME/Library/Caches/Homebrew - name: "ounit2-lwt: MacOSX" os: osx - env: OCAML_VERSION=4.08 PACKAGE="ounit2-lwt" + env: OCAML_VERSION=4.10 PACKAGE="ounit2-lwt" cache: directories: - $HOME/Library/Caches/Homebrew diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/CHANGES.md new/ocaml-ounit-2.2.3/CHANGES.md --- old/ocaml-ounit-2.2.2/CHANGES.md 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/CHANGES.md 2020-07-11 17:47:08.000000000 +0200 @@ -1,3 +1,15 @@ +## v2.2.3 - 2020-07-11 + +### Changed +- Minimal OCaml version is now 4.04. + +### Fixed +- Make colored output and JUnit features more prominent in the documentation. + (Closes: #13, #12) +- Increase default timeouts, so that they work as well for slow architecture + like s390x. The fastest timeout is now 20s (immediate test) and the longest + is 1h (huge test). (Closes: #18) + ## v2.2.2 - 2020-01-24 ### Fixed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/README.md new/ocaml-ounit-2.2.3/README.md --- old/ocaml-ounit-2.2.2/README.md 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/README.md 2020-07-11 17:47:08.000000000 +0200 @@ -9,6 +9,11 @@ framework for Haskell. It is similar to [JUnit], and other XUnit testing frameworks. +Features: +- colored output +- JUnit report generation +- HTML report generation + [HUnit]: http://hunit.sourceforge.net/ [JUnit]: http://junit.org/ [travis]: https://travis-ci.org/gildor478/ounit @@ -23,7 +28,7 @@ The recommended way to install ounit is via the [opam package manager][opam]: ```sh -$ opam install ounit +$ opam install ounit2 ``` Documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/appveyor.yml new/ocaml-ounit-2.2.3/appveyor.yml --- old/ocaml-ounit-2.2.2/appveyor.yml 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/appveyor.yml 2020-07-11 17:47:08.000000000 +0200 @@ -5,13 +5,9 @@ FORK_USER: ocaml FORK_BRANCH: master CYG_ROOT: C:\cygwin64 - # TODO: remove version on the pins. - PINS: ounit2.2.1.2:. ounit2-lwt.2.1.2:. ounit.2.1.2:. ounit-lwt.2.1.2:. EXTRA_DEPS: dune OUNIT_CI: true - # TODO: ounit -> ounit2 - PACKAGE: ounit - REVDEPS: junit_ounit + PACKAGE: ounit2 install: - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1";)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/ounit2-lwt.opam new/ocaml-ounit-2.2.3/ounit2-lwt.opam --- old/ocaml-ounit-2.2.2/ounit2-lwt.opam 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/ounit2-lwt.opam 2020-07-11 17:47:08.000000000 +0200 @@ -6,7 +6,7 @@ bug-reports: "https://github.com/gildor478/ounit/issues"; doc: "https://gildor478.github.io/ounit/"; depends: [ - "ocaml" {>= "4.02.3"} + "ocaml" {>= "4.04.0"} "dune" {>= "1.11.0"} "lwt" "ounit2" {= version} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/ounit2.opam new/ocaml-ounit-2.2.3/ounit2.opam --- old/ocaml-ounit-2.2.2/ounit2.opam 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/ounit2.opam 2020-07-11 17:47:08.000000000 +0200 @@ -6,7 +6,7 @@ bug-reports: "https://github.com/gildor478/ounit/issues"; doc: "https://gildor478.github.io/ounit/"; depends: [ - "ocaml" {>= "4.02.3"} + "ocaml" {>= "4.04.0"} "dune" {>= "1.11.0"} "base-bytes" "base-unix" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/oUnit/dune new/ocaml-ounit-2.2.3/src/lib/oUnit/dune --- old/ocaml-ounit-2.2.2/src/lib/oUnit/dune 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/oUnit/dune 2020-07-11 17:47:08.000000000 +0200 @@ -0,0 +1,3 @@ +(documentation + (package ounit) + (mld_files index)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/oUnit/index.mld new/ocaml-ounit-2.2.3/src/lib/oUnit/index.mld --- old/ocaml-ounit-2.2.2/src/lib/oUnit/index.mld 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/oUnit/index.mld 2020-07-11 17:47:08.000000000 +0200 @@ -0,0 +1,4 @@ +{1 OUnit transitional package} + +This is a transitional package for ounit2. Use +{{: ../ounit2/index.html} ounit2 package}. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/ounit-lwt/dune new/ocaml-ounit-2.2.3/src/lib/ounit-lwt/dune --- old/ocaml-ounit-2.2.2/src/lib/ounit-lwt/dune 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/ounit-lwt/dune 2020-07-11 17:47:08.000000000 +0200 @@ -0,0 +1,3 @@ +(documentation + (package ounit-lwt) + (mld_files index)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/ounit-lwt/index.mld new/ocaml-ounit-2.2.3/src/lib/ounit-lwt/index.mld --- old/ocaml-ounit-2.2.2/src/lib/ounit-lwt/index.mld 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/ounit-lwt/index.mld 2020-07-11 17:47:08.000000000 +0200 @@ -0,0 +1,4 @@ +{1 OUnit-lwt transitional package} + +This is a transitional package for ounit2-lwt. Use +{{: ../ounit2-lwt/index.html} ounit2-lwt package}. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitCheckEnv.ml new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitCheckEnv.ml --- old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitCheckEnv.ml 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitCheckEnv.ml 2020-07-11 17:47:08.000000000 +0200 @@ -94,7 +94,7 @@ [ (fun () -> assert_equal - ~msg:"Check that the current working dir hasn't change during the \ + ~msg:"Check that the current working dir hasn't changed during the \ test." ~printer:(fun s -> s) t.pwd @@ -102,7 +102,7 @@ (fun () -> let convert t = SetEnv.of_list (Array.to_list t.env) in SetEnv.assert_equal - ~msg:"Check that the environment variables haven't change during \ + ~msg:"Check that the environment variables haven't changed during \ the test." (convert t) (convert t')); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitPropList.ml new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitPropList.ml --- old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitPropList.ml 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitPropList.ml 2020-07-11 17:47:08.000000000 +0200 @@ -32,7 +32,7 @@ (** Property list. - @see <http://bit.ly/17mVpKv> Eigenclass Article on property list. + @see <http://mlton.org/PropertyList> MLton property list. *) type t = (int, unit -> unit) Hashtbl.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitRunnerProcesses.ml new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitRunnerProcesses.ml --- old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitRunnerProcesses.ml 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitRunnerProcesses.ml 2020-07-11 17:47:08.000000000 +0200 @@ -260,5 +260,8 @@ let init () = if Sys.os_type = "Unix" then - OUnitRunner.register "processes" 100 - (runner create_worker workers_waiting) + match Sys.backend_type with + | Native | Bytecode -> + OUnitRunner.register "processes" 100 + (runner create_worker workers_waiting) + | Other _ -> () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitTest.ml new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitTest.ml --- old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitTest.ml 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitTest.ml 2020-07-11 17:47:08.000000000 +0200 @@ -98,10 +98,10 @@ let delay_of_length = function - | Immediate -> 1.0 - | Short -> 60.0 - | Long -> 600.0 - | Huge -> 1800.0 + | Immediate -> 20.0 (* 20 seconds *) + | Short -> 600.0 (* 10 minutes *) + | Long -> 1800.0 (* 30 minutes *) + | Huge -> 3600.0 (* 1 hour *) | Custom_length f -> f let get_shard_id test_ctxt = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitUtils.ml new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitUtils.ml --- old/ocaml-ounit-2.2.2/src/lib/ounit2/advanced/oUnitUtils.ml 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/ounit2/advanced/oUnitUtils.ml 2020-07-11 17:47:08.000000000 +0200 @@ -114,7 +114,7 @@ None else try - Scanf.sscanf eol "file \"%s@\", line %d, characters %d-%d" + Scanf.sscanf eol "%_s@\"%s@\", line %d, characters %d-%d" (fun fn line _ _ -> Some (fn, line)) with Scanf.Scan_failure _ -> None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ounit-2.2.2/src/lib/ounit2/index.mld new/ocaml-ounit-2.2.3/src/lib/ounit2/index.mld --- old/ocaml-ounit-2.2.2/src/lib/ounit2/index.mld 2020-01-24 23:04:24.000000000 +0100 +++ new/ocaml-ounit-2.2.3/src/lib/ounit2/index.mld 2020-07-11 17:47:08.000000000 +0200 @@ -15,8 +15,8 @@ {2 Getting Started} -The basic principle of a OUnit test suite is to have a {i test.ml} file which will -contain the tests, and an OCaml module under test, here named {i foo.ml}. +The basic principle of a OUnit test suite is to have a {i test.ml} file which +will contain the tests, and an OCaml module under test, here named {i foo.ml}. File {i foo.ml}: {[ @@ -78,6 +78,29 @@ When using {!OUnit2.run_test_tt_main}, a non-zero exit code signals that the test suite failed. +{2 Extra features} + +OUnit supports colored output and JUnit/HTML generation. They are command line +flags or environment variables that you can set before running OUnit test +suites. + +{ul +{- Colored output: +{ul + {- Set the environment variable [OUNIT_CI=true]} + {- Use the command line flag [-ci true]} +}} +{- JUnit generation: +{ul + {- Set the environment variable [OUNIT_OUTPUT_JUNIT_FILE=fn]} + {- Use the command line flag [-output-junit-file fn]} +}} +{- HTML report +{ul + {- Set the environment variable [OUNIT_OUTPUT_HTML_DIR=fn]} + {- Use the command line flag [-output-html-dir fn]} +}}} + {2 Advanced usage} This section is only for advanced users who wish to uncover the power of OUnit. @@ -181,6 +204,21 @@ ;; ]} +{3 OUnit2.Threads} + +This module provide thread related utilities. In particular, it provides a +"thread" runner, that allows to run concurrently tests using OCaml threads. +This should provide a good level of parallelism on Windows, for UNIX systems +it is recommended to use the standard "process" runner. + +To install the extra thread runner: + +{[ +let () = OUnitThreads.init () +]} + +{!modules: OUnitThreads} + {3 Effective OUnit} This section has general tips about unit testing and OUnit. It is the @@ -266,5 +304,13 @@ code under test. With time, your test suite will grow faster than your program/library. A good ratio is 33%. +{3 OUnit2.Advanced} + +These modules should only be used when building low-level OUnit features. They +allow to create your own process runner or logger. + +Modules available in [ounit2.advanced]: +{!modules: OUnitAssert OUnitBracket OUnitCache OUnitCheckEnv OUnitChooser OUnitConf OUnitCore OUnitDiff OUnitLogger OUnitLoggerCI OUnitLoggerHTML OUnitLoggerJUnit OUnitLoggerStd OUnitPlugin OUnitPropList OUnitResultSummary OUnitRunner OUnitRunnerProcesses OUnitShared OUnitState OUnitTest OUnitTestData OUnitUtils} + @author Maas-Maarten Zeeman @author Sylvain Le Gall
