Index: mollom.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.inc,v
retrieving revision 1.5
diff -u -p -r1.5 mollom.inc
--- mollom.inc	16 Aug 2010 02:26:08 -0000	1.5
+++ mollom.inc	26 Aug 2010 19:22:11 -0000
@@ -66,8 +66,15 @@ function _mollom_authentication($public_
  * Refreshes the list of Mollom's XML-RPC servers.
  */
 function _mollom_retrieve_server_list() {
-  // Start from a hard coded list of servers:
-  $servers = array('http://xmlrpc1.mollom.com', 'http://xmlrpc2.mollom.com', 'http://xmlrpc3.mollom.com');
+  // Start from a hard coded list of servers.
+  // When running simpletests, we want all requests to hit the new backend code
+  // on xmlrpc1.mollom.com.
+  if (!empty($GLOBALS['drupal_test_info']['in_child_site'])) {
+    $servers = array('http://xmlrpc1.mollom.com');
+  }
+  else {
+    $servers = array('http://xmlrpc1.mollom.com', 'http://xmlrpc2.mollom.com', 'http://xmlrpc3.mollom.com');
+  }
 
   // Use the list of servers to retrieve a list of servers from mollom.com:
   foreach ($servers as $server) {
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.67
diff -u -p -r1.67 mollom.module
--- mollom.module	16 Aug 2010 02:26:08 -0000	1.67
+++ mollom.module	26 Aug 2010 11:18:51 -0000
@@ -1253,7 +1253,8 @@ function mollom_validate_analysis(&$form
   $result = mollom('mollom.checkContent', $data);
 
   // Trigger global fallback behavior if there is no result.
-  if (!isset($result['session_id']) || !isset($result['spam'])) {
+  // @todo Isn't mollom() invoking _mollom_fallback() already?
+  if (!isset($result['session_id'])) {
     return _mollom_fallback();
   }