[mapguide-commits] r4576 - sandbox/adsk/2.2gp/Server/src/UnitTesting

[svn_mapguide at osgeo.org]

Author: brucedechant
Date: 2010-02-03 12:41:34 -0500 (Wed, 03 Feb 2010)
New Revision: 4576

Modified:
   sandbox/adsk/2.2gp/Server/src/UnitTesting/TestTileService.cpp
Log:
Remove temporarily commented out code as unit tests no longer hang.


Modified: sandbox/adsk/2.2gp/Server/src/UnitTesting/TestTileService.cpp
===================================================================
--- sandbox/adsk/2.2gp/Server/src/UnitTesting/TestTileService.cpp	2010-02-03 00:00:29 UTC (rev 4575)
+++ sandbox/adsk/2.2gp/Server/src/UnitTesting/TestTileService.cpp	2010-02-03 17:41:34 UTC (rev 4576)
@@ -423,18 +423,18 @@
                 break;
 
             // under Linux we get a deadlock if we don't call this every once in a while
-            /*if (nRequest % 25 == 0)
+            if (nRequest % 25 == 0)
                 manager->wait();
             else
-            {*/
+            {
                 // pause briefly (10ms) before checking again
                 ACE_Time_Value t(0, 10000);
                 ACE_OS::sleep(t);
-            /*}*/
+            }
         }
 
         // make sure the manager is in a good state
-        //manager->wait();
+        manager->wait();
 
         // done with the tile indices
         delete [] tileRows;
@@ -618,18 +618,18 @@
                 break;
 
             // under Linux we get a deadlock if we don't call this every once in a while
-            /*if (nRequest % 25 == 0)
+            if (nRequest % 25 == 0)
                 manager->wait();
             else
-            {*/
+            {
                 // pause briefly (10ms) before checking again
                 ACE_Time_Value t(0, 10000);
                 ACE_OS::sleep(t);
-            //}
+            }
         }
 
         // make sure the manager is in a good state
-        //manager->wait();
+        manager->wait();
 
         // At this point all the tiles in the cache should be set.
         // Let's now randomly replace these tiles.
@@ -681,18 +681,18 @@
                 break;
 
             // under Linux we get a deadlock if we don't call this every once in a while
-            /*if (nRequest % 25 == 0)
+            if (nRequest % 25 == 0)
                 manager->wait();
             else
-            {*/
+            {
                 // pause briefly (10ms) before checking again
                 ACE_Time_Value t(0, 10000);
                 ACE_OS::sleep(t);
-            //}
+            }
         }
 
         // make sure the manager is in a good state
-        //manager->wait();
+        manager->wait();
 
         // done with the tile indices
         delete [] tileRows;
@@ -816,18 +816,18 @@
                 break;
 
             // under Linux we get a deadlock if we don't call this every once in a while
-            /*if (nRequest % 25 == 0)
+            if (nRequest % 25 == 0)
                 manager->wait();
             else
-            {*/
+            {
                 // pause briefly (10ms) before checking again
                 ACE_Time_Value t(0, 10000);
                 ACE_OS::sleep(t);
-            //}
+            }
         }
 
         // make sure the manager is in a good state
-        //manager->wait();
+        manager->wait();
 
         // done with the tile indices
         delete [] tileRows;