Merge pull request #2622 from fvarose/fix_keyword_remover_usage_error

Fix keyword remover usage error
robotframework · Jun 20, 2017 · 87a2ce2 · 87a2ce2
2 parents a3367ff + 06b8a8f
commit 87a2ce2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/atest/robot/cli/rebot/invalid_usage.robot b/atest/robot/cli/rebot/invalid_usage.robot
@@ -43,7 +43,7 @@ Invalid --TagStatLink
     ...    --tagstatlink a:b:c --TagStatLink less_than_3x_:
 
 Invalid --RemoveKeywords
-    Invalid value for option '--removekeywords'. Expected 'ALL', 'PASSED', 'NAME:<pattern>', 'FOR', or 'WUKS' but got 'Invalid'.
+    Invalid value for option '--removekeywords'. Expected 'ALL', 'PASSED', 'NAME:<pattern>', 'TAG:<pattern>', 'FOR', or 'WUKS' but got 'Invalid'.
     ...    --removekeywords wuks --removek name:xxx --RemoveKeywords Invalid
 
 *** Keywords ***

diff --git a/atest/robot/cli/runner/invalid_usage.robot b/atest/robot/cli/runner/invalid_usage.robot
@@ -31,4 +31,4 @@ Invalid --TagStatLink
 
 Invalid --RemoveKeywords
     --removekeywords wuks --removek name:xxx --RemoveKeywords Invalid tests.txt
-    ...    Invalid value for option '--removekeywords'. Expected 'ALL', 'PASSED', 'NAME:<pattern>', 'FOR', or 'WUKS' but got 'Invalid'.
+    ...    Invalid value for option '--removekeywords'. Expected 'ALL', 'PASSED', 'NAME:<pattern>', 'TAG:<pattern>', 'FOR', or 'WUKS' but got 'Invalid'.
diff --git a/src/robot/result/keywordremover.py b/src/robot/result/keywordremover.py
@@ -30,8 +30,8 @@ def KeywordRemover(how):
                 'FOR': ForLoopItemsRemover,
                 'WUKS': WaitUntilKeywordSucceedsRemover}[upper]()
     except KeyError:
-        raise DataError("Expected 'ALL', 'PASSED', 'NAME:<pattern>', 'FOR', "
-                        "or 'WUKS' but got '%s'." % how)
+        raise DataError("Expected 'ALL', 'PASSED', 'NAME:<pattern>', 'TAG:<pattern>', "
+                        "'FOR', or 'WUKS' but got '%s'." % how)
 
 
 class _KeywordRemover(SuiteVisitor):