[Pkg-ocaml-maint-commits] [SCM] obus packaging branch, master, updated. debian/1.1.2-1-2-gb429870

[Nicolas Dandrimont]

The following commit has been merged in the master branch:
commit f440b7f78f574f5d3e40b1a53bf5d1e9ae7c996c
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Sun Jun 12 18:05:55 2011 +0200

    Timeout instead of disabling tests

diff --git a/debian/changelog b/debian/changelog
index b292207..5f324d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+obus (1.1.2-2) unstable; urgency=low
+
+  * Add a timeout instead of disabling tests
+
+ -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Sun, 12 Jun 2011 18:04:01 +0200
+
 obus (1.1.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0002-Add-a-timeout-to-tests.patch b/debian/patches/0002-Add-a-timeout-to-tests.patch
new file mode 100644
index 0000000..c2511fd
--- /dev/null
+++ b/debian/patches/0002-Add-a-timeout-to-tests.patch
@@ -0,0 +1,22 @@
+From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Date: Sat, 11 Jun 2011 23:38:24 +0200
+Subject: Add a timeout to tests
+
+---
+ tests/main.ml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tests/main.ml b/tests/main.ml
+index 8f34e8c..38d656d 100644
+--- a/tests/main.ml
++++ b/tests/main.ml
+@@ -33,7 +33,7 @@ let rec run_tests failures total = function
+       lwt () = title name in
+       begin
+         try_lwt
+-          test ()
++          Lwt_unix.with_timeout 30. test
+         with exn ->
+           lwt () = Lwt_io.printlf "test failed with: %s" (Printexc.to_string exn) in
+           lwt () = Lwt_io.printl (Printexc.get_backtrace ()) in
+-- 
diff --git a/debian/patches/0002-Disable-tests-needing-a-session-bus.patch b/debian/patches/0002-Disable-tests-needing-a-session-bus.patch
deleted file mode 100644
index 87c20d5..0000000
--- a/debian/patches/0002-Disable-tests-needing-a-session-bus.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
-Date: Sat, 11 Jun 2011 23:38:24 +0200
-Subject: Disable tests needing a session bus
-
----
- tests/main.ml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tests/main.ml b/tests/main.ml
-index 8f34e8c..f7ff34b 100644
---- a/tests/main.ml
-+++ b/tests/main.ml
-@@ -61,7 +61,7 @@ lwt () =
-     "serialization", Test_serialization.test;
-     "string validation", Test_validation.test;
-     "authentication", Test_auth.test;
--    "communication", Test_communication.test;
-+    (*"communication", Test_communication.test;*)
-     "garbage collection", Test_gc.test;
-   ]
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
index dbeda74..7bc7644 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Fix-for-type-conv-2.3.0.patch
-0002-Disable-tests-needing-a-session-bus.patch
+0002-Add-a-timeout-to-tests.patch

-- 
obus packaging