Merge branch 'develop'

.all-contributorsrc

@@ -31,6 +31,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "NimVek",
+      "name": "NimVek",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6333118?v=4",
+      "profile": "https://github.com/NimVek",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.vscode/settings.json

@@ -7,5 +7,6 @@
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.nosetestsEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "files.eol": "\n"
 }

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.1.1 - 2021-07-29
+
+* Fixed CRLF bug, thanks @NimVek (#146)
+
 ## 1.1.1-beta - 2021-07-25
 
 ### Fixed 

README.md

@@ -1,6 +1,6 @@
 # Robotmk
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 *A complete solution to integrate **Robot Framework** End2End tests into **Checkmk***
@@ -313,6 +313,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://kleinski.de"><img src="https://avatars.githubusercontent.com/u/3239736?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcus Klein</b></sub></a><br /><a href="https://github.com/simonmeggle/robotmk/issues?q=author%3Akleinski" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://burntfen.com"><img src="https://avatars.githubusercontent.com/u/910753?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Richard Littauer</b></sub></a><br /><a href="#mentoring-RichardLitt" title="Mentoring">🧑‍🏫</a></td>
     <td align="center"><a href="https://github.com/a-lohmann"><img src="https://avatars.githubusercontent.com/u/9255272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>A. Lohmann</b></sub></a><br /><a href="https://github.com/simonmeggle/robotmk/issues?q=author%3Aa-lohmann" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/NimVek"><img src="https://avatars.githubusercontent.com/u/6333118?v=4?s=100" width="100px;" alt=""/><br /><sub><b>NimVek</b></sub></a><br /><a href="https://github.com/simonmeggle/robotmk/issues?q=author%3ANimVek" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

agents_plugins/robotmk-runner.py

@@ -1,51 +1,51 @@
-#!/usr/bin/env python3
-# (c) 2020 Simon Meggle <[email protected]>
-
-# This file is part of Robotmk, a module for the integration of Robot
-# framework test results into Checkmk.
-# https://robotmk.org
-# https://github.com/simonmeggle/robotmk
-# https://robotframework.org/#tools
-
-# Robotmk is free software;  you can redistribute it and/or modify it
-# under the  terms of the  GNU General Public License  as published by
-# the Free Software Foundation in version 3.  This file is distributed
-# in the hope that it will be useful, but WITHOUT ANY WARRANTY;  with-
-# out even the implied warranty of  MERCHANTABILITY  or  FITNESS FOR A
-# PARTICULAR PURPOSE. See the  GNU General Public License for more de-
-# ails.  You should have  received  a copy of the  GNU  General Public
-# License along with GNU Make; see the file  COPYING.  If  not,  write
-# to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
-# Boston, MA 02110-1301 USA.
-
-try:
-    # Import the main Robotmk functions from the same directory (Windows)
-    from robotmk import robotmk, RMKPlugin, RMKrunner, test_for_modules
-except ImportError:
-    # If the import fails, try to import robotmk form the parent directory (Linux)
-    # This is the case when the runner gets scheduled asynchronously on Linux where
-    # it is saved in a subfolder
-    import sys, os
-    sys.path.insert(1, os.path.join(sys.path[0], '..'))
-    from robotmk import robotmk, RMKPlugin, RMKrunner, test_for_modules
-
-
-def main():
-    test_for_modules()
-    RMKPlugin.get_args()
-    rmk = RMKrunner()
-    cmdline_suites='all' # TBD: start suites from cmdline
-    rmk.start_suites(cmdline_suites)
-    rmk.loginfo("... Quitting Runner, bye. ---") 
-    # It is important to write at least one byte to the agent so that it can save this
-    # as a state with a cache_time. 
-    print('')    
-
-if __name__ == '__main__':
-    main()
-else:
-    # when imported as module
-    import mergedeep
-    import robot
-    import yaml
-    from dateutil import parser
+#!/usr/bin/env python3
+# (c) 2020 Simon Meggle <[email protected]>
+
+# This file is part of Robotmk, a module for the integration of Robot
+# framework test results into Checkmk.
+# https://robotmk.org
+# https://github.com/simonmeggle/robotmk
+# https://robotframework.org/#tools
+
+# Robotmk is free software;  you can redistribute it and/or modify it
+# under the  terms of the  GNU General Public License  as published by
+# the Free Software Foundation in version 3.  This file is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY;  with-
+# out even the implied warranty of  MERCHANTABILITY  or  FITNESS FOR A
+# PARTICULAR PURPOSE. See the  GNU General Public License for more de-
+# ails.  You should have  received  a copy of the  GNU  General Public
+# License along with GNU Make; see the file  COPYING.  If  not,  write
+# to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+try:
+    # Import the main Robotmk functions from the same directory (Windows)
+    from robotmk import robotmk, RMKPlugin, RMKrunner, test_for_modules
+except ImportError:
+    # If the import fails, try to import robotmk form the parent directory (Linux)
+    # This is the case when the runner gets scheduled asynchronously on Linux where
+    # it is saved in a subfolder
+    import sys, os
+    sys.path.insert(1, os.path.join(sys.path[0], '..'))
+    from robotmk import robotmk, RMKPlugin, RMKrunner, test_for_modules
+
+
+def main():
+    test_for_modules()
+    RMKPlugin.get_args()
+    rmk = RMKrunner()
+    cmdline_suites='all' # TBD: start suites from cmdline
+    rmk.start_suites(cmdline_suites)
+    rmk.loginfo("... Quitting Runner, bye. ---") 
+    # It is important to write at least one byte to the agent so that it can save this
+    # as a state with a cache_time. 
+    print('')    
+
+if __name__ == '__main__':
+    main()
+else:
+    # when imported as module
+    import mergedeep
+    import robot
+    import yaml
+    from dateutil import parser

agents_plugins/robotmk.py

@@ -45,7 +45,7 @@
 
 
 local_tz = datetime.utcnow().astimezone().tzinfo
-ROBOTMK_VERSION = 'v1.1.1-beta'
+ROBOTMK_VERSION = 'v1.1.1'
 
 #<robotmk-keywordlibrary
 # Imported from https://raw.githubusercontent.com/simonmeggle/robotframework-robotmk/

bakery/v2/robotmk.py

@@ -18,7 +18,7 @@
 # to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
 # Boston, MA 02110-1301 USA.
 
-ROBOTMK_VERSION = 'v1.1.1-beta'
+ROBOTMK_VERSION = 'v1.1.1'
 
 from typing import Iterable, TypedDict, List
 from pathlib import Path

checks/v1/robotmk

@@ -51,7 +51,7 @@ except:
 
 utc = pytz.utc
 
-ROBOTMK_VERSION = 'v1.1.1-beta'
+ROBOTMK_VERSION = 'v1.1.1'
 
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'
 

checks/v2/robotmk.py

@@ -32,7 +32,7 @@
 
 # UTC = pytz.utc
 
-ROBOTMK_VERSION = 'v1.1.1-beta'
+ROBOTMK_VERSION = 'v1.1.1'
 
 DEFAULT_SVC_PREFIX = 'Robot Framework E2E $SUITEID$SPACE-$SPACE'