Related to issue 38888: Failing SS Build
authorMartin Taal <martin.taal@openbravo.com>
Tue, 04 Dec 2018 10:17:36 +0100
changeset 7948 7699203f30f6
parent 7947 11cf74fc31db
child 7949 42706a78882d
Related to issue 38888: Failing SS Build
Change sql query
src-test/org/openbravo/test/mobile/retail/multiserver/MultiserverUtils.java
--- a/src-test/org/openbravo/test/mobile/retail/multiserver/MultiserverUtils.java	Tue Dec 04 07:59:48 2018 +0100
+++ b/src-test/org/openbravo/test/mobile/retail/multiserver/MultiserverUtils.java	Tue Dec 04 10:17:36 2018 +0100
@@ -108,7 +108,7 @@
         if (!isServerSynchronized.get(0)) {
 
           final String sqlLogging = "select * from sym_outgoing_batch where node_id = '"
-              + toServerKey + "' and status not in ('OK', 'IG') ORDER BY node_id";
+              + toServerKey + "' and status not in ('OK', 'IG')";
 
           new DatabaseHelperQuery() {
             @Override
@@ -200,10 +200,9 @@
 
   public static void removeBatchesInError(final ServerType server) {
     final String serverKey = getServerKey(server);
-    final String sqlLogging = "select * from sym_outgoing_batch where node_id = '" + serverKey
-        + "' and status = 'ER' ORDER BY node_id";
-
-    TestLogger.getLogger().info("Removing batch in error on " + server);
+    final String sql = "select node_id AS count from sym_outgoing_batch where node_id = '"
+        + serverKey + "' and status='ER'";
+    TestLogger.getLogger().info("Removing batch in error on " + server + " " + sql);
 
     new DatabaseHelperQuery() {
       @Override
@@ -224,8 +223,7 @@
               "org.openbravo.replication.symmetricds.process.IgnoreWholeBatch", json.toString());
         }
       }
-    }.execute(sqlLogging, server);
-
+    }.execute(sql, server);
   }
 
   public static void doKernelActionRequest(ServerType server, String action, String content) {