Improve choose_file to work also when using directly from a library

Author: aaltat

atest/acceptance/keywords/choose_file.robot

@@ -31,6 +31,17 @@ Choose File With Grid
     Textfield Value Should Be    file_to_upload    C:\\fakepath\\temp2.txt
     [Teardown]    Remove File    ${CURDIR}${/}temp2.txt
 
+Choose File With Grid From Library Using SL choose_file method
+    [Documentation]
+    ...    LOG 4:6 DEBUG GLOB:    POST*/session/*/file*"file": "*
+    [Tags]    OnlyGrid
+    [Setup]    Go To Page "forms/file_upload_form.html"
+    Touch    ${CURDIR}${/}temp42.txt
+    Import Library    ${CURDIR}/../../resources/testlibs/ChooseFileLib.py
+    ChooseFileLib.my_choose_file    file_to_upload    ${CURDIR}${/}temp42.txt
+    Textfield Value Should Be    file_to_upload    C:\\fakepath\\temp42.txt
+    [Teardown]    Remove File    ${CURDIR}${/}temp42.txt
+
 Input Text Should Work Same Way When Not Using Grid
     [Documentation]
     ...    LOG 2:5 DEBUG GLOB:    POST*/session/*/clear {"*
@@ -51,32 +62,6 @@ Input Text Should Work Same Way When Using Grid
     Textfield Value Should Be    file_to_upload    C:\\fakepath\\temp3.txt
     [Teardown]    Remove File    ${CURDIR}${/}temp3.txt
 
-Running Keyword Is Saved Correctly
-    ${keyword_method} =     get_running_keyword
-    Should Be Equal    get_running_keyword    ${keyword_method}
-    ${keyword_method} =     Get Running Keyword
-    Should Be Equal    get_running_keyword    ${keyword_method}
-    ${keyword_method} =     Get Running Keyword By Decorator
-    Should Be Equal    Get Running Keyword By Decorator    ${keyword_method}
-    ${keyword_method} =     get_running_keyword_by_decorator
-    Should Be Equal    Get Running Keyword By Decorator    ${keyword_method}
-
-Running Keyword Is Cleared Correctly
-    ${sl} =    Get Library Instance    SeleniumLibrary
-    Should Be Equal    ${sl._running_keyword}    ${None}
-    ${keyword_method} =     Get Running Keyword
-    Should Be Equal    get_running_keyword    ${keyword_method}
-    ${sl} =    Get Library Instance    SeleniumLibrary
-    Should Be Equal    ${sl._running_keyword}    ${None}
-
-Running Keyword Is Cleared Correctly When Error
-    ${sl} =    Get Library Instance    SeleniumLibrary
-    Should Be Equal    ${sl._running_keyword}    ${None}
-    Run Keyword And Expect Error    Page should have contained text 'Is not here' but did not.
-    ...    Page Should Contain    Is not here
-    ${sl} =    Get Library Instance    SeleniumLibrary
-    Should Be Equal    ${sl._running_keyword}    ${None}
-
 *** Keywords ***
 Navigate To File Upload Form And Create Temp File To Upload
     Cannot Be Executed in IE

atest/acceptance/resource.robot

@@ -1,5 +1,5 @@
 *** Setting ***
-Library           SeleniumLibrary    run_on_failure=Nothing    implicit_wait=0.2 seconds    plugins=RunningKeyword.RunningKeyword
+Library           SeleniumLibrary    run_on_failure=Nothing    implicit_wait=0.2 seconds
 Library           Collections
 Library           OperatingSystem
 Library           DateTime

atest/resources/testlibs/ChooseFileLib.py

@@ -0,0 +1,6 @@
+from robot.libraries.BuiltIn import BuiltIn
+
+
+def my_choose_file(locator, path):
+    sl = BuiltIn().get_library_instance('SeleniumLibrary')
+    sl.choose_file(locator, path)

atest/resources/testlibs/RunningKeyword.py

@@ -467,14 +467,11 @@ def __init__(self, timeout=5.0, implicit_wait=0.0,
         DynamicCore.__init__(self, libraries)
 
     def run_keyword(self, name, args, kwargs):
-        self._running_keyword = name
         try:
             return DynamicCore.run_keyword(self, name, args, kwargs)
         except Exception:
             self.failure_occurred()
             raise
-        finally:
-            self._running_keyword = None
 
     def get_keyword_tags(self, name):
         tags = list(DynamicCore.get_keyword_tags(self, name))

src/SeleniumLibrary/__init__.py

@@ -212,8 +212,12 @@ def choose_file(self, locator, file_path):
         Example:
         | `Choose File` | my_upload_field | ${CURDIR}/trades.csv |
         """
-        self.info('Sending %s to browser.' % os.path.abspath(file_path))
-        self.find_element(locator).send_keys(file_path)
+        self.ctx._running_keyword = 'choose_file'
+        try:
+            self.info('Sending %s to browser.' % os.path.abspath(file_path))
+            self.find_element(locator).send_keys(file_path)
+        finally:
+            self.ctx._running_keyword = None
 
     @keyword
     def input_password(self, locator, password, clear=True):