couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r820498 - in /couchdb/branches/0.10.x: ./ etc/default/couchdb test/etap/040-util.t
Date Wed, 30 Sep 2009 23:41:33 GMT
Author: davisp
Date: Wed Sep 30 23:41:33 2009
New Revision: 820498

URL: http://svn.apache.org/viewvc?rev=820498&view=rev
Log:
Backporting fix for 040-util.t test.


Modified:
    couchdb/branches/0.10.x/   (props changed)
    couchdb/branches/0.10.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.10.x/test/etap/040-util.t

Propchange: couchdb/branches/0.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 30 23:41:33 2009
@@ -3,4 +3,4 @@
 /couchdb/branches/form:729440-730015
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
-/couchdb/trunk:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817278,817398,817400,817403,817749,817793,818249,819091,819436,819799,819977,820495
+/couchdb/trunk:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817278,817398,817400,817403,817749,817793,818249,819091,819341,819343,819436,819799,819977,820495

Propchange: couchdb/branches/0.10.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 30 23:41:33 2009
@@ -3,5 +3,5 @@
 /couchdb/branches/form/etc/default/couchdb:729440-730015
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
-/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817277-817278,817398,817400,817403,817749,817793,818249,819091,819436,819799,819977,820495
+/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910,813803,815921,817277-817278,817398,817400,817403,817749,817793,818249,819091,819341,819343,819436,819799,819977,820495
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.10.x/test/etap/040-util.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/test/etap/040-util.t?rev=820498&r1=820497&r2=820498&view=diff
==============================================================================
--- couchdb/branches/0.10.x/test/etap/040-util.t (original)
+++ couchdb/branches/0.10.x/test/etap/040-util.t Wed Sep 30 23:41:33 2009
@@ -39,13 +39,23 @@
     % terminate_linked
     Self = self(),
     spawn(fun() ->
-                  ChildPid = spawn_link(fun() -> receive shutdown -> ok end end),
-                  couch_util:terminate_linked(normal),
-                  Self ! {pid, ChildPid}
-          end),
+        SecondSelf = self(),
+        ChildPid = spawn_link(fun() ->
+            SecondSelf ! {child, started},
+            receive shutdown -> ok end
+        end),
+        PidUp = receive
+            {child, started} -> ok
+        after 1000 ->
+            {error, timeout}
+        end,
+        etap:is(ok, PidUp, "Started a linked process."),
+        couch_util:terminate_linked(normal),
+        Self ! {pid, ChildPid}
+    end),
     receive
         {pid, Pid} ->
-            etap:ok(not is_process_alive(Pid), "why wont this work?")
+            etap:ok(not is_process_alive(Pid), "Linked process was killed.")
     end,
 
     % new_uuid



Mime
View raw message