snapshot - still working on orchestrated tests.

Author: thsc42

src/net/sharksystem/ui/messenger/cli/ProductionUI.java

@@ -49,12 +49,15 @@ public class ProductionUI {
 
     public static void main(String[] args) throws SharkException, IOException {
         ProductionUI cli = new ProductionUI(args);
-        cli.startCLI();
+        String peerName = "no peer name defined as parameter";
+        if(args != null && args.length > 0) peerName = args[0];
+        cli.startCLI(peerName);
     }
 
-    public void startCLI() {
+    public void startCLI(String peerName) {
         System.out.println("type 'help' to see the list of commands");
         smUI.runCommandLoop();
+        System.out.println("end CLI for " + peerName);
     }
 
     public ProductionUI(String[] args) throws SharkException, IOException {

src/net/sharksystem/ui/messenger/cli/SharkNetMessengerAppSupportingDistributedTesting.java

@@ -408,7 +408,21 @@ public void run() {
                 effectiveScripts[peerIndex] = sb.toString() + this.test2run.scripts.get(peerIndex) + scriptEnd_Exit;
             }
 
-            // send script to each peer
+            // run orchestrator script first - wait to collect logs
+            ScriptRunnerThread scriptRunnerThread =
+                    new ScriptRunnerThread(ORCHESTRATOR_PEER_NAME,
+                            Integer.toString(this.testNumber), orchestratorScript);
+            SharkNetMessengerAppSupportingDistributedTesting.this.tellUI(
+                    "running script as peer " + ORCHESTRATOR_PEER_NAME + ": " + orchestratorScript);
+            scriptRunnerThread.start();
+
+            // now - send script to each peer
+
+            // to avoid even the slightest chance of a race condition - make a little break;
+            try { Thread.sleep(1000); } catch (InterruptedException e) {}
+
+            SharkNetMessengerAppSupportingDistributedTesting.this.tellUI("sending test scripts to peers");
+
             try {
                 for (int i = 0; i < this.test2run.peerEnvironment.size(); i++) {
                     PeerHostingEnvironmentDescription peerEnvironment = this.test2run.peerEnvironment.get(i);
@@ -432,14 +446,6 @@ public void run() {
 
                     SharkNetMessengerAppSupportingDistributedTesting.this.
                             tellUI("test scripts sent to " + peerEnvironment.ipAddress);
-
-                    // run orchestrator script - wait to collect logs
-                    ScriptRunnerThread scriptRunnerThread =
-                            new ScriptRunnerThread(ORCHESTRATOR_PEER_NAME,
-                                    Integer.toString(this.testNumber), orchestratorScript);
-                    SharkNetMessengerAppSupportingDistributedTesting.this.tellUI(
-                            "running script as peer " + ORCHESTRATOR_PEER_NAME + ": " + orchestratorScript);
-                    scriptRunnerThread.start();
                 }
             }
             catch(IOException | SharkNetMessengerException ioe) {

src/net/sharksystem/ui/messenger/cli/commands/basics/UICommandExit.java

@@ -17,7 +17,9 @@ public UICommandExit(SharkNetMessengerApp sharkMessengerApp, SharkNetMessengerUI
     @Override
     public void execute() throws Exception {
         //this.printTODOReimplement();
-        System.exit(1);
+        this.getSharkMessengerApp().tellUI("end CLI for peer " +
+            this.getSharkMessengerApp().getSharkPeer().getPeerID());
+        System.exit(0);
     }
 
     @Override

src/net/sharksystem/ui/messenger/cli/commands/testing/ScriptRunnerThread.java

@@ -30,7 +30,7 @@ public ScriptRunnerThread(String peerName, String testName, String script) {
     }
 
     public void run() {
-        this.ui.startCLI();
+        this.ui.startCLI(peerName);
     }
 
     public static String getFriendlyPeerName(String peerName) {

src/net/sharksystem/ui/messenger/cli/commands/testing/UICommandOrchestrateTest.java

@@ -22,30 +22,37 @@ protected void execute() throws Exception {
         * script for each peer
          */
 
-        /**
-         * what works - independent tests - no interaction between test peers
-         * Test with one peer... test is executed - results are persistent in test peer
-         * Test with two peers... no script is executed, Clara even claims not to be able to stage a test.
-         */
+         // what works - independent tests - no interaction between test peers
+        // 2025-12-03
+        String script0_0 =  "sendMessage HiFromTest;wait 1000;lsMessages;";
+        String script0_1 =  "sendMessage HiFromTest;wait 1000;lsMessages;";
 
-        // Orchestrator: orchestrateTest dummy; openTCP 9999
-        // dann Peers: connectTCP localhost 9999; scriptRQ
+        // Orchestrator: orchestrateTest dummy; openTCP 6907
+        // dann Peers: connectTCP localhost 6907; scriptRQ
 
-        String script1_0 =  "connectTCP localhost 9999;release A1;wait 5000;lsMessages;";
-        String script1_1 = "openTCP 9999;block A1;sendMessage HiFromBob;wait 5000;";
+        // testing - seems orchestrator does not receive peerSettled release messages - it does sometimes, though.
+        // Race condition - no doubt. S***.
+        // check locks - getting even weirder - to test peer names are generated twice?
+        // There is nothing but a good mystery :)
+        // what the difference to scenario 0? no additional TCP connections(?)
+        String script1_A =  "wait 5000;connectTCP localhost 9999;release A1;wait 5000;lsMessages;";
+        String script1_B = "openTCP 9999;block A1;sendMessage HiFromBob;wait 5000;";
 
-        // works: 2025.12.03
-        String script0_0 =  "sendMessage HiFromTest;wait 1000;lsMessages;";
-        String script0_1 =  "sendMessage HiFromTest;wait 1000;lsMessages;";
+        /* effective scripts
+        // message sent but not received but at least scenario runs - it is a race condition causing the problem above.
+        o: openTCP 1984;block peerSettled_0_0;block peerSettled_0_1;release launchTest_0;;exit;
+        a: connectTCP 192.168.0.116 1984;release peerSettled_0_0;block launchTest_0;wait 1000;wait 5000;connectTCP localhost 9999;release A1;wait 5000;lsMessages;;exit;
+        b: connectTCP 192.168.0.116 1984;release peerSettled_0_1;block launchTest_0;wait 1000;openTCP 9999;block A1;sendMessage HiFromBob;wait 5000;;exit;
+         */
 
         //List<PeerHostingEnvironmentDescription> requiredPeerEnvironment = new ArrayList<>();
         List<String> scripts = new ArrayList<>();
 
         // fill with example data
         this.getSharkMessengerApp().tellUI("use sample data - todo: fill with real data");
         // anything will do
-        scripts.add(script0_0);
-        scripts.add(script0_1);
+        scripts.add(script1_A);
+        scripts.add(script1_B);
 
         this.snmTestSupport.orchestrateTest(scripts);
 

src/net/sharksystem/ui/messenger/cli/commands/testing/UICommandWait.java

@@ -10,9 +10,15 @@ public UICommandWait(SharkNetMessengerApp sharkMessengerApp, SharkNetMessengerUI
     }
 
     @Override
-    protected void execute() throws Exception {
+    protected void execute() {
         this.getSharkMessengerApp().tellUI("wait " + this.getIntegerArgument() + " ms ...");
-        Thread.sleep(this.getIntegerArgument());
+
+        try {
+            Thread.sleep(this.getIntegerArgument());
+        } catch (InterruptedException e) {
+            this.getSharkMessengerApp().tellUIError("wait received interrupt - that shouldn't happen");
+            e.printStackTrace();
+        }
         this.getSharkMessengerApp().tellUI("resume");
     }