diff --git a/.all-contributorsrc b/.all-contributorsrc index c63900a0..5dd19480 100644 --- a/.all-contributorsrc +++ b/.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, diff --git a/.vscode/settings.json b/.vscode/settings.json index 2b759354..7a886c8f 100644 --- a/.vscode/settings.json +++ b/.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" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c4470a89..27ac9347 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 720efa26..c0510c1a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Robotmk -[![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-) *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
Marcus Klein
🐛
Richard Littauer
🧑‍🏫
A. Lohmann
🐛 +
NimVek
🐛 diff --git a/agents_plugins/robotmk-runner.py b/agents_plugins/robotmk-runner.py index 3c42d180..e84f0949 100755 --- a/agents_plugins/robotmk-runner.py +++ b/agents_plugins/robotmk-runner.py @@ -1,51 +1,51 @@ -#!/usr/bin/env python3 -# (c) 2020 Simon Meggle - -# 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 + +# 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 diff --git a/agents_plugins/robotmk.py b/agents_plugins/robotmk.py index e51c1922..dfd5effb 100755 --- a/agents_plugins/robotmk.py +++ b/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' #