Commit a8700056 authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

fix: K8sAndOssClientProcessesTests processes clean up

parent 0dfed8fe

src/main/java/signal/handlers/ServiceTerminationSignalHandler.java

+2 −0
Changes for src/main/java/signal/handlers/ServiceTerminationSignalHandler.java: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ public class ServiceTerminationSignalHandler { 
    }



    @Incoming(TMF_OSS_SERVICE_TERMINATION)

    @Blocking

    public CompletionStage<Void> handleOssServiceTermination(Message<String> msg) {

        try {

            ServiceTerminationDataWithTimer serviceTerminationDataWithTimer = parse(msg.getPayload());
@@ -125,6 +126,7 @@ public class ServiceTerminationSignalHandler { 
    }



    @Incoming(TMF_END_USER_SERVICE_TERMINATION)

    @Blocking

    public CompletionStage<Void> handle(Message<String> msg) {

        try {

            ServiceTerminationDataWithTimer serviceTerminationDataWithTimer = parse(msg.getPayload());

src/test/java/sonata/integration/tests/K8sAndOssClientProcessesTests.java

+20 −2
Changes for src/test/java/sonata/integration/tests/K8sAndOssClientProcessesTests.java: 20 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -290,13 +290,31 @@ class K8sAndOssClientProcessesTests { 
        registryGetOrganizationCredentialsOutgoingChannel.clear();



        // clear any hanging process instances

        abort(k8sServiceTerminationSubprocess.instances());

        ossServiceTerminationSubprocess.instances().stream()

                .forEach(

                        instance -> {

                            try {

                                instance.abort();

                            } catch (Exception ignored) {

                                // Ignore already terminated or non-existent instances

                            }

                        });



        k8sServiceTerminationSubprocess.instances().stream()

                .forEach(

                        instance -> {

                            try {

                                instance.abort();

                            } catch (Exception ignored) {

                                // Ignore already terminated or non-existent instances

                            }

                        });



        abort(ossClient5GOrderProcess.instances());

        abort(ossClientOrderK8saasProcess.instances());

        abort(fabricApiServiceConnectionProcess.instances());

        abort(fabricApiServiceConnectionTeardownProcess.instances());

        abort(ossClientUpdateTerminationDate.instances());

        abort(ossServiceTerminationSubprocess.instances());

        abort(k8sStandaloneProcess.instances());

        abort(ossClientUpdatePlatformServiceProcess.instances());

        abort(registryStoreKubernetesInfoProcess.instances());