X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_thread_pool_observer.cpp;h=d84e9d0c1f989c7a2ccdfb3518813010af0140c6;hb=0264192f26c10308aad161983ea29568c96521a6;hp=61387591694d1aa1773c9143c8515acd9227101f;hpb=b70b9ec78f0ab1c3ed3b432de986159129a0e4ed;p=metaproxy-moved-to-github.git

diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp
index 6138759..d84e9d0 100644
--- a/src/test_thread_pool_observer.cpp
+++ b/src/test_thread_pool_observer.cpp
@@ -1,7 +1,22 @@
-/* $Id: test_thread_pool_observer.cpp,v 1.12 2007-01-25 14:05:54 adam Exp $
+/* $Id: test_thread_pool_observer.cpp,v 1.15 2007-11-02 17:47:41 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
-   See the LICENSE file for details
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #include "config.hpp"
@@ -15,6 +30,7 @@
 #include "thread_pool_observer.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
@@ -82,9 +98,17 @@ void My_Timer_Thread::socketNotify(int event)
     m->m_val = m_requests++;
     m->m_timer = this;
     m_t->put(m);
+#if 0
+    // prevent input queue from being filled up..
+    // bug #1064: Test test_thread_pool_observer hangs
+    // fortunately we don't need this hack. because put (ebove)
+    // will block itself if needed
+    if (m->m_val == 30)
+         m_obs->deleteObserver(this);
+#endif
 }
 
-BOOST_AUTO_UNIT_TEST( thread_pool_observer1 ) 
+BOOST_AUTO_TEST_CASE( thread_pool_observer1 ) 
 {
     SocketManager mySocketManager;
 
@@ -93,7 +117,7 @@ BOOST_AUTO_UNIT_TEST( thread_pool_observer1 )
     while (t.m_responses < 30 && mySocketManager.processEvent() > 0)
         ;
     BOOST_CHECK_EQUAL(t.m_responses, 30);
-    BOOST_CHECK(t.m_sum >= 435);
+    BOOST_CHECK(t.m_sum >= 435); // = 29*30/2
 }
 
 /*