Better flaky test check

bwoebi · bwoebi · commit 7bafb131463d · 2024-05-28T20:24:25.000+02:00
Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -3365,7 +3365,7 @@ jobs:
             docker-compose --version
       - run:
           name: Clone System Tests repo
-          command: git clone https://github.com/DataDog/system-tests.git; pushd system-tests; git checkout luc/disable-tests-broken-by-design; popd
+          command: git clone https://github.com/DataDog/system-tests.git
       - run:
           name: Copy .tar.gz file to system test binaries folder
           command: |
diff --git a/tests/ext/appsec/sca_test.inc b/tests/ext/appsec/sca_test.inc
@@ -21,7 +21,7 @@ for ($i = 0; $i < 100; ++$i) {
         foreach (file(__DIR__ . '/'.$id.'-telemetry.out') as $l) {
             if ($l) {
                 $json = json_decode($l, true);
-                if (($json["application"]["service_name"] ?? "") != "background_sender-php-service") {
+                if ($json && ($json["application"]["service_name"] ?? "") != "background_sender-php-service") {
                     array_push($batches, ...($json["request_type"] == "message-batch" ? $json["payload"] : [$json]));
                 }
             }
@@ -44,5 +44,8 @@ for ($i = 0; $i < 100; ++$i) {
         }
     }
 }
+if ($i == 100) {
+    var_dump(file(__DIR__ . '/'.$id.'-telemetry.out'));
+}
 
 ?>

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ for ($i = 0; $i < 100; ++$i) {`
`21`	`21`	`foreach (file(__DIR__ . '/'.$id.'-telemetry.out') as $l) {`
`22`	`22`	`if ($l) {`
`23`	`23`	`$json = json_decode($l, true);`
`24`		`- if (($json["application"]["service_name"] ?? "") != "background_sender-php-service") {`
	`24`	`+ if ($json && ($json["application"]["service_name"] ?? "") != "background_sender-php-service") {`
`25`	`25`	`array_push($batches, ...($json["request_type"] == "message-batch" ? $json["payload"] : [$json]));`
`26`	`26`	`}`
`27`	`27`	`}`
`@@ -44,5 +44,8 @@ for ($i = 0; $i < 100; ++$i) {`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
	`47`	`+if ($i == 100) {`
	`48`	`+ var_dump(file(__DIR__ . '/'.$id.'-telemetry.out'));`
	`49`	`+}`
`47`	`50`
`48`	`51`	`?>`