diff options
| author | Yves Duhem <yves.duhem@mongodb.com> | 2017-07-25 16:08:31 -0400 |
|---|---|---|
| committer | Yves Duhem <yves.duhem@mongodb.com> | 2017-07-25 17:48:47 -0400 |
| commit | 645172dfe76a2a25b6c19f3ba6086c8605c617ab (patch) | |
| tree | 5db7637f81875006913357d18a9f4cc60970a966 /buildscripts/ciconfig | |
| parent | f0d41183e735546c83ff96d7d5afc11b9c94cb9f (diff) | |
| download | mongo-645172dfe76a2a25b6c19f3ba6086c8605c617ab.tar.gz | |
SERVER-30308 Handle absent test_flags in combined_resmoke_args()
Diffstat (limited to 'buildscripts/ciconfig')
| -rw-r--r-- | buildscripts/ciconfig/evergreen.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/buildscripts/ciconfig/evergreen.py b/buildscripts/ciconfig/evergreen.py index 325e8b236bf..da2112d6bf0 100644 --- a/buildscripts/ciconfig/evergreen.py +++ b/buildscripts/ciconfig/evergreen.py @@ -185,7 +185,11 @@ class VariantTask(Task): def combined_resmoke_args(self): """Return the combined resmoke arguments resulting from the concatenation of the task's resmoke_args parameter and the variant's test_flags parameter.""" - return "{} {}".format(self.resmoke_args, self.variant.test_flags) + test_flags = self.variant.test_flags + if test_flags: + return "{} {}".format(self.resmoke_args, test_flags) + else: + return self.resmoke_args class ResmokeArgs(object): |