Improve scripts for CI, -- output: test.env

Author: kenneth-jia

.github/workflows/on_pull_request.yml

@@ -69,7 +69,9 @@ jobs:
           sleep 10
           kafkacat -L -b 127.0.0.1:40091
           # run tests
-          export KAFKA_BROKER_LIST="127.0.0.1:40091,127.0.0.1:40092,127.0.0.1:40093"; ctest -VV
+          cat test.env
+          source test.env
+          ctest -VV
           # stop kafka cluster
           kafka-server-stop.sh
           zookeeper-server-stop.sh
@@ -137,7 +139,9 @@ jobs:
           sleep 10
           kafkacat -L -b 127.0.0.1:40091
           # run tests
-          export KAFKA_BROKER_LIST="127.0.0.1:40091,127.0.0.1:40092,127.0.0.1:40093"; ctest -VV
+          cat test.env
+          source test.env
+          ctest -VV
           # stop kafka cluster
           kafka-server-stop.sh
           zookeeper-server-stop.sh
@@ -205,7 +209,9 @@ jobs:
           sleep 10
           kafkacat -L -b 127.0.0.1:40091
           # run tests
-          export KAFKA_BROKER_LIST="127.0.0.1:40091,127.0.0.1:40092,127.0.0.1:40093"; ctest -VV
+          cat test.env
+          source test.env
+          ctest -VV
           # stop kafka cluster
           kafka-server-stop.sh
           zookeeper-server-stop.sh
@@ -273,7 +279,9 @@ jobs:
           sleep 10
           kafkacat -L -b 127.0.0.1:40091
           # run tests
-          export KAFKA_BROKER_LIST="127.0.0.1:40091,127.0.0.1:40092,127.0.0.1:40093"; ctest -VV
+          cat test.env
+          source test.env
+          ctest -VV
           # stop kafka cluster
           kafka-server-stop.sh
           zookeeper-server-stop.sh
@@ -340,7 +348,9 @@ jobs:
           sleep 10
           kafkacat -L -b 127.0.0.1:40091
           # run tests
-          export KAFKA_BROKER_LIST="127.0.0.1:40091,127.0.0.1:40092,127.0.0.1:40093"; ctest -VV
+          cat test.env
+          source test.env
+          ctest -VV
           # stop kafka cluster
           kafka-server-stop.sh
           zookeeper-server-stop.sh
@@ -407,7 +417,9 @@ jobs:
           sleep 10
           kafkacat -L -b 127.0.0.1:40091
           # run tests
-          export KAFKA_BROKER_LIST="127.0.0.1:40091,127.0.0.1:40092,127.0.0.1:40093"; ctest -VV
+          cat test.env
+          source test.env
+          ctest -VV
           # stop kafka cluster
           kafka-server-stop.sh
           zookeeper-server-stop.sh
@@ -475,7 +487,9 @@ jobs:
           sleep 10
           kafkacat -L -b 127.0.0.1:40091
           # run tests
-          export KAFKA_BROKER_LIST="127.0.0.1:40091,127.0.0.1:40092,127.0.0.1:40093"; ctest -VV
+          cat test.env
+          source test.env
+          ctest -VV
           # stop kafka cluster
           kafka-server-stop.sh
           zookeeper-server-stop.sh

include/kafka/Project.h

@@ -5,7 +5,8 @@
 #define KAFKA_API kafka
 #endif
 
-// Here is the MACRO to enable UT stubs
+// Here is the MACRO to enable internal stubs for UT
 // #ifndef KAFKA_API_ENABLE_UNIT_TEST_STUBS
 // #define KAFKA_API_ENABLE_UNIT_TEST_STUBS
-// #endif
+// #endif
+

scripts/start-local-kafka-cluster.py

@@ -35,23 +35,20 @@ def addProcess(self, cmd, name, outFile, errFile):
                              stdout=out,
                              stderr=err)
 
-        print('name: {0}, pid: {1}'.format(name, p.pid))
-
         if 'kafka' in name:
             kafkaPids.append(p.pid)
         else:
             zookeeperPids.append(p.pid)
 
         self.processList.append((p, name))
 
-
     def run(self):
         anyFailure = False
         while self.processList:
             for (i, (p, name)) in enumerate(self.processList):
                 ret = p.poll()
                 if ret != None:
-                    print('failed: {0}, pid: {1}, ret: {2}'.format(name, p.pid, ret))
+                    print('Failed to start server: {0}, pid: {1}, ret: {2}'.format(name, p.pid, ret))
                     self.processList.pop(i)
                     anyFailure = True
                     break
@@ -60,8 +57,8 @@ def run(self):
 
     def terminate(self):
         for (p, name) in self.processList:
-            print('terminate: {0}, pid: {1}'.format(name, p.pid))
             p.kill()
+            print('{0} terminated'.format(name))
 
     def __del__(self):
         self.terminate()
@@ -143,6 +140,10 @@ def main():
 
     print('Kafka server started... (zookeeper pid: {0}, kafka pids: {1})'.format(zookeeperPids, kafkaPids))
 
+    with open(r'test.env', 'w') as envFile:
+        envFile.write('export KAFKA_BROKER_LIST={0}\n'.format(','.join(['127.0.0.1:{0}'.format(port) for port in brokerPorts])))
+        envFile.write('export KAFKA_BROKER_PIDS={0}\n'.format(','.join([str(pid) for pid in kafkaPids])))
+
     processPool.run()