Merge pull request #66 in SL/pbcommand from bugfix/SL-3048-nunit-excl…

…ude to develop

* commit 'b3a4ec9219ae30ed33030ce3bd847f1bc4015a74':
  bump version
  add option to exclude property-less tests

pbcommand/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 1, 0)
+VERSION = (1, 1, 1)
 
 
 def get_version():

pbcommand/testkit/nunit.py

@@ -96,12 +96,21 @@ def create_nunit_xml(test_cases):
     return doc
 
 
-def combine_results(xml_files):
+def combine_results(xml_files, only_with_properties=False):
+    """
+    Combine multiple NUnit outputs into a single test suite.
+
+    :param xml_files: list of NUnit input file names
+    :param only_with_properties: only output test cases that include one or more property tags (for Bamboo reporting)
+    """
     test_cases = []
     for xml_file in xml_files:
         log.info("Reading NUnit report %s", xml_file)
         dom = minidom.parse(xml_file)
         for node in dom.getElementsByTagName("test-case"):
+            if only_with_properties:
+                if len(node.getElementsByTagName("property")) == 0:
+                    continue
             test_cases.append(TestCase.from_xml(node))
     return create_nunit_xml(test_cases)