rerunmerger.ReRunMerger -> merger.Merger

robotframework · Oct 3, 2014 · a5c85e5 · a5c85e5
1 parent bed1d85
commit a5c85e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/robot/result/rerunmerger.py → src/robot/result/merger.py b/src/robot/result/rerunmerger.py → src/robot/result/merger.py
@@ -16,7 +16,7 @@
 from robot.model import SuiteVisitor
 
 
-class ReRunMerger(SuiteVisitor):
+class Merger(SuiteVisitor):
 
     def __init__(self, result):
         self.root = result.suite

diff --git a/src/robot/result/resultbuilder.py b/src/robot/result/resultbuilder.py
@@ -19,7 +19,7 @@
 
 from .executionresult import Result, CombinedResult
 from .flattenkeywordmatcher import FlattenKeywordMatcher
-from .rerunmerger import ReRunMerger
+from .merger import Merger
 from .xmlelementhandlers import XmlElementHandler
 
 
@@ -46,7 +46,7 @@ def ExecutionResult(*sources, **options):
 
 def _merge_results(original, merged, options):
     result = ExecutionResult(original, **options)
-    merger = ReRunMerger(result)
+    merger = Merger(result)
     for path in merged:
         merged = ExecutionResult(path, **options)
         merger.merge(merged)