Merge pull request #2173 from bugsnag/tms/flake-fixes

e2e test flake fixes

Author: twometresteve

features/fixtures/mazerunner/jvm-scenarios/src/main/java/com/bugsnag/android/mazerunner/scenarios/DiscardOldSessionScenario.kt

@@ -33,7 +33,7 @@ internal class DiscardOldSessionScenario(
 
     fun waitForSessionFile() {
         val dir = sessionDir()
-        while (dir.listFiles()!!.isEmpty()) {
+        while (dir.listFiles().isNullOrEmpty()) {
             Thread.sleep(100)
         }
     }

features/full_tests/native_session_tracking.feature

@@ -24,13 +24,17 @@ Feature: NDK Session Tracking
     And the error payload field "events.0.session.events.unhandled" equals 1
 
   Scenario: Starting a session, notifying, followed by a C crash
-    When I run "CXXSessionInfoCrashScenario" and relaunch the crashed app
-    And I configure Bugsnag for "CXXSessionInfoCrashScenario"
+    When I run "CXXSessionInfoCrashScenario"
     And I wait to receive a session
-    And I wait to receive 3 errors
+    And I wait to receive 2 errors
+    And I discard the oldest session
     And I discard the oldest error
     And I discard the oldest error
-    Then the error payload contains a completed handled native report
-    And the event contains session info
+
+    And I relaunch the app after a crash
+    And I configure Bugsnag for "CXXSessionInfoCrashScenario"
+    # The fixture will now send the unhandled error plus the 2 handled errors
+    # again,  because they are invoked after the delivery of the session.
+    And I wait to receive 3 errors
     And the error payload field "events.0.session.events.unhandled" equals 1
-    And the error payload field "events.0.session.events.handled" equals 2
+    And the error payload field "events.0.session.events.handled" equals 2