From c911a69ae6aebd8b7c26b97cf4f0308596db2472 Mon Sep 17 00:00:00 2001 From: Jonathan Griffin Date: Tue, 21 Oct 2014 13:12:35 -0700 Subject: [PATCH] Bug 1086678 - Provide a default value for subsuite, r=jmaher --- .../mozbase/manifestparser/manifestparser/manifestparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/mozbase/manifestparser/manifestparser/manifestparser.py b/testing/mozbase/manifestparser/manifestparser/manifestparser.py index b1fa6e42076..0e4f8aecc58 100755 --- a/testing/mozbase/manifestparser/manifestparser/manifestparser.py +++ b/testing/mozbase/manifestparser/manifestparser/manifestparser.py @@ -1156,7 +1156,7 @@ class TestManifest(ManifestParser): # Look for conditional subsuites, and replace them with the subsuite itself # (if the condition is true), or nothing. for test in tests: - subsuite = test.get('subsuite') + subsuite = test.get('subsuite', '') if ',' in subsuite: try: subsuite, condition = subsuite.split(',') @@ -1172,7 +1172,7 @@ class TestManifest(ManifestParser): # Filter on current subsuite if options: - if options.subsuite: + if hasattr(options, 'subsuite') and options.subsuite: tests = [test for test in tests if options.subsuite == test['subsuite']] else: tests = [test for test in tests if not test['subsuite']]