summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristopher Stauffer <cristopher.stauffer@mongodb.com>2017-05-26 15:29:52 -0400
committerCristopher Stauffer <cristopher.stauffer@mongodb.com>2017-05-31 10:26:08 -0400
commitcb31bfd735d669fa36859f75c8586d8d120b2de3 (patch)
tree69acc57d0c9ca5197fb1fc639543dcaa9ab9e03e
parent8462f9a1ed3b6bbb1f7e6f6accae56ef524224ab (diff)
downloadmongo-cb31bfd735d669fa36859f75c8586d8d120b2de3.tar.gz
SERVER-26027: Updating log statement to include exit code on tear down in situations where process already stopped
-rw-r--r--buildscripts/resmokelib/testing/fixtures/shardedcluster.py7
-rw-r--r--buildscripts/resmokelib/testing/fixtures/standalone.py7
2 files changed, 8 insertions, 6 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/shardedcluster.py b/buildscripts/resmokelib/testing/fixtures/shardedcluster.py
index 42860217978..16840c4e4c5 100644
--- a/buildscripts/resmokelib/testing/fixtures/shardedcluster.py
+++ b/buildscripts/resmokelib/testing/fixtures/shardedcluster.py
@@ -359,10 +359,11 @@ class _MongoSFixture(interface.Fixture):
running_at_start = self.is_running()
success = True # Still a success even if nothing is running.
- if not running_at_start and self.port is not None:
+ if not running_at_start and self.mongos is not None:
self.logger.info(
- "mongos on port %d was expected to be running in _do_teardown(), but wasn't.",
- self.port)
+ "mongos on port %d was expected to be running in _do_teardown(), but wasn't. "
+ "Exited with code %d.",
+ self.port, self.mongos.poll())
if self.mongos is not None:
if running_at_start:
diff --git a/buildscripts/resmokelib/testing/fixtures/standalone.py b/buildscripts/resmokelib/testing/fixtures/standalone.py
index ba62b3d2b8c..e64937cd4a9 100644
--- a/buildscripts/resmokelib/testing/fixtures/standalone.py
+++ b/buildscripts/resmokelib/testing/fixtures/standalone.py
@@ -120,10 +120,11 @@ class MongoDFixture(interface.Fixture):
running_at_start = self.is_running()
success = True # Still a success even if nothing is running.
- if not running_at_start and self.port is not None:
+ if not running_at_start and self.mongod is not None:
self.logger.info(
- "mongod on port %d was expected to be running in _do_teardown(), but wasn't.",
- self.port)
+ "mongod on port %d was expected to be running in _do_teardown(), but wasn't. "
+ "Exited with code %d.",
+ self.port, self.mongod.poll())
if self.mongod is not None:
if running_at_start: