diff options
author | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2019-04-09 09:41:23 -0400 |
---|---|---|
committer | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2019-04-09 09:41:23 -0400 |
commit | 3150154574757e70f1499e97456956b5376630c8 (patch) | |
tree | 4441047644c380383bc4ab21f7abc6efc96ba6b4 | |
parent | 3502bfe67ac5172aa4d22a46e3aa2749a37d665f (diff) | |
download | mongo-3150154574757e70f1499e97456956b5376630c8.tar.gz |
SERVER-40518 Change backup_restore*.js tests to send resmoke.py SIGINT.
-rw-r--r-- | jstests/noPassthrough/libs/backup_restore.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/jstests/noPassthrough/libs/backup_restore.js b/jstests/noPassthrough/libs/backup_restore.js index 51552285687..b18fb9e25d6 100644 --- a/jstests/noPassthrough/libs/backup_restore.js +++ b/jstests/noPassthrough/libs/backup_restore.js @@ -345,7 +345,14 @@ var BackupRestoreTest = function(options) { assert(fsmStatus.alive, testName + ' FSM client was not running at end of test and exited with code: ' + fsmStatus.exitCode); - stopMongoProgramByPid(fsmPid); + + const kSIGINT = 2; + const exitCode = stopMongoProgramByPid(fsmPid, kSIGINT); + if (!_isWindows()) { + // The mongo shell calls TerminateProcess() on Windows rather than more gracefully + // interrupting resmoke.py test execution. + assert.eq(130, exitCode, 'expected resmoke.py to exit due to being interrupted'); + } // Make sure the databases are not in a drop-pending state. This can happen if we // killed the FSM client while it was in the middle of dropping them. |