Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4317 FIX Rule list: Removed the row limit of the rule tables

by Lars Michelsen

Module: check_mk Branch: master Commit: ff73c3c2a7bbf9a33561351c480e890f7d0fb593 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff73c3c2a7bbf9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 2 13:37:41 2017 +0100 4317 FIX Rule list: Removed the row limit of the rule tables Change-Id: I4f5513651672804a7bfbfc740e5ce017bf454720 --- .werks/4317 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4317 b/.werks/4317 new file mode 100644 index 0000000..3617ff6 --- /dev/null +++ b/.werks/4317 @@ -0,0 +1,9 @@ +Title: Rule list: Removed the row limit of the rule tables +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486039030 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index af24d14..cefbb1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * 4224 FIX: Improved exception handling during WATO slave site activation * 4237 FIX: Fixed rendering of old timestamps... * 4231 FIX: Fixed broken host renaming when files are in var/check_mk/web + * 4317 FIX: Rule list: Removed the row limit of the rule tables Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 05d3aea..6d59833 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12197,7 +12197,7 @@ class ModeEditRuleset(WatoMode): continue table.begin("rules", title="%s %s" % (_("Rules in folder"), alias_path), - css="ruleset", searchable=False, sortable=False) + css="ruleset", searchable=False, sortable=False, limit=None) else: if skip_this_folder: continue

7 years, 7 months

updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: ba92c2d60da7c02c85233728acff5df6c32e540c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba92c2d60da7c0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 2 12:53:47 2017 +0100 updated werk text Change-Id: I8203bd313016817b11942f9f3472222b5b188b17 --- .werks/4018 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.werks/4018 b/.werks/4018 index 06a8485..2167e3b 100644 --- a/.werks/4018 +++ b/.werks/4018 @@ -20,6 +20,8 @@ curl http://localhost/heute/check_mk/webapi.py?action=get_all_contactgroups&_use Furthermore you can add, edit and delete these groups + + <tt> # All group types can be managed with similar requests

7 years, 7 months

4018 WATO WebAPI: new functions to manage host, service and contactgroups

by Andreas Boesl

Module: check_mk Branch: master Commit: e3a559b747860bd33efbc8288115c9f0aef66f9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3a559b747860b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 2 12:51:26 2017 +0100 4018 WATO WebAPI: new functions to manage host, service and contactgroups A few new functions to manage host, service and contact groups have been introduced. First of all you can get all groups of a specific type with the url parameter action=get_all_{groupname} <tt> Example calls: curl http://localhost/heute/check_mk/webapi.py?action=get_all_hostgroups&_userna… curl http://localhost/heute/check_mk/webapi.py?action=get_all_servicegroups&_use… curl http://localhost/heute/check_mk/webapi.py?action=get_all_contactgroups&_use… </tt> Furthermore you can add, edit and delete these groups <tt> # All group types can be managed with similar requests # Add curl "http://localhost/heute/check_mk/webapi.py?action=add_hostgroup&_username=au…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' curl "http://localhost/heute/check_mk/webapi.py?action=add_servicegroup&_username…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' curl "http://localhost/heute/check_mk/webapi.py?action=add_contactgroup&_username…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' # Edit group curl "http://localhost/heute/check_mk/webapi.py?action=edit_hostgroup&_username=a…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' curl "http://localhost/heute/check_mk/webapi.py?action=edit_servicegroup&_usernam…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' curl "http://localhost/heute/check_mk/webapi.py?action=edit_contactgroup&_usernam…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' # Delete group curl "http://localhost/heute/check_mk/webapi.py?action=delete_hostgroup&_username…" -d 'request={"groupname": "hostgroup1"}' curl "http://localhost/heute/check_mk/webapi.py?action=delete_servicegroup&_usern…" -d 'request={"groupname": "servicegroup1"}' curl "http://localhost/heute/check_mk/webapi.py?action=delete_contactgroup&_usern…" -d 'request={"groupname": "contactgroup1"}' # For contact groups you may also specify a list of nagvis maps in the extra attribute nagivs_maps curl "http://localhost/heute/check_mk/webapi.py?action=add_contactgroup&_username…" -d 'request={"groupname": "newgroup2", "alias": "the alias", "nagvis_maps": ["dfdf"]}' </tt> Change-Id: Iac0ef79fc5736f115d30bc4b3206c95f896465da --- .werks/4018 | 43 +++++++++++++++++++++++++++++++++++++++++++ ChangeLog | 2 ++ 2 files changed, 45 insertions(+) diff --git a/.werks/4018 b/.werks/4018 new file mode 100644 index 0000000..d323883 --- /dev/null +++ b/.werks/4018 @@ -0,0 +1,43 @@ +Title: WATO WebAPI: new functions to manage host, service and contactgroups +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486032438 +Class: feature + + +A few new functions to manage host, service and contact groups have been introduced. + +First of all you can get all groups of a specific type with the url parameter action=get_all_{groupname} +<tt> +Example calls: +curl http://localhost/heute/check_mk/webapi.py?action=get_all_hostgroups&_userna… +curl http://localhost/heute/check_mk/webapi.py?action=get_all_servicegroups&_use… +curl http://localhost/heute/check_mk/webapi.py?action=get_all_contactgroups&_use… +</tt> + +Furthermore you can add, edit and delete these groups +<tt> + # All group types can be managed with similar requests + + # Add + curl "http://localhost/heute/check_mk/webapi.py?action=add_hostgroup&_username=au…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=add_servicegroup&_username…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=add_contactgroup&_username…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' + + # Edit group + curl "http://localhost/heute/check_mk/webapi.py?action=edit_hostgroup&_username=a…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=edit_servicegroup&_usernam…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=edit_contactgroup&_usernam…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' + + # Delete group + curl "http://localhost/heute/check_mk/webapi.py?action=delete_hostgroup&_username…" -d 'request={"groupname": "hostgroup1"}' + curl "http://localhost/heute/check_mk/webapi.py?action=delete_servicegroup&_usern…" -d 'request={"groupname": "servicegroup1"}' + curl "http://localhost/heute/check_mk/webapi.py?action=delete_contactgroup&_usern…" -d 'request={"groupname": "contactgroup1"}' + + + # For contact groups you may also specify a list of nagvis maps in the extra attribute nagivs_maps + curl "http://localhost/heute/check_mk/webapi.py?action=add_contactgroup&_username…" -d 'request={"groupname": "newgroup2", "alias": "the alias", "nagvis_maps": ["dfdf"]}' +</tt> + diff --git a/ChangeLog b/ChangeLog index ec44cd0..af24d14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,7 @@ * 4142 New extended search dialog for rulesets and rules... * 4217 WATO rules can now be moved via drag&drop... * 4227 New manual WATO configuration lock mechanism... + * 4018 WATO WebAPI: new functions to manage host, service and contactgroups... * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config" * 4218 FIX: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) @@ -151,6 +152,7 @@ * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... * 4258 FIX: snmp_extended_info: fixed undefined variable + 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')...

7 years, 7 months

updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: 59a6008e5d18e6748de5095749206107e1fa528a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59a6008e5d18e6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 2 12:54:37 2017 +0100 updated werk text Change-Id: I134e24dac835643fee026b2f6405598d0d3917b9 --- .werks/4018 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.werks/4018 b/.werks/4018 index 2167e3b..90402c3 100644 --- a/.werks/4018 +++ b/.werks/4018 @@ -14,7 +14,9 @@ First of all you can get all groups of a specific type with the url parameter ac <tt> Example calls: curl http://localhost/heute/check_mk/webapi.py?action=get_all_hostgroups&_userna… + curl http://localhost/heute/check_mk/webapi.py?action=get_all_servicegroups&_use… + curl http://localhost/heute/check_mk/webapi.py?action=get_all_contactgroups&_use… </tt> @@ -25,23 +27,29 @@ Furthermore you can add, edit and delete these groups <tt> # All group types can be managed with similar requests - # Add + # Add group curl "http://localhost/heute/check_mk/webapi.py?action=add_hostgroup&_username=au…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=add_servicegroup&_username…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=add_contactgroup&_username…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' - # Edit group + # Edit group curl "http://localhost/heute/check_mk/webapi.py?action=edit_hostgroup&_username=a…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=edit_servicegroup&_usernam…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=edit_contactgroup&_usernam…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' - # Delete group + # Delete group curl "http://localhost/heute/check_mk/webapi.py?action=delete_hostgroup&_username…" -d 'request={"groupname": "hostgroup1"}' + curl "http://localhost/heute/check_mk/webapi.py?action=delete_servicegroup&_usern…" -d 'request={"groupname": "servicegroup1"}' + curl "http://localhost/heute/check_mk/webapi.py?action=delete_contactgroup&_usern…" -d 'request={"groupname": "contactgroup1"}' - # For contact groups you may also specify a list of nagvis maps in the extra attribute nagivs_maps + # For contact groups you may also specify a list of nagvis maps in the extra attribute nagivs_maps curl "http://localhost/heute/check_mk/webapi.py?action=add_contactgroup&_username…" -d 'request={"groupname": "newgroup2", "alias": "the alias", "nagvis_maps": ["dfdf"]}' </tt>

7 years, 7 months

updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: 4a32b1cf8d8b03b93c8b848bbb225c88c62c1fb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a32b1cf8d8b03… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 2 12:53:00 2017 +0100 updated werk text Change-Id: I4fcf7c7d2f92106a7eae48ef25b2efac207d9b59 --- .werks/4018 | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.werks/4018 b/.werks/4018 index d323883..06a8485 100644 --- a/.werks/4018 +++ b/.werks/4018 @@ -8,33 +8,35 @@ Class: feature A few new functions to manage host, service and contact groups have been introduced. + First of all you can get all groups of a specific type with the url parameter action=get_all_{groupname} <tt> Example calls: -curl http://localhost/heute/check_mk/webapi.py?action=get_all_hostgroups&_userna… -curl http://localhost/heute/check_mk/webapi.py?action=get_all_servicegroups&_use… -curl http://localhost/heute/check_mk/webapi.py?action=get_all_contactgroups&_use… +curl http://localhost/heute/check_mk/webapi.py?action=get_all_hostgroups&_userna… +curl http://localhost/heute/check_mk/webapi.py?action=get_all_servicegroups&_use… +curl http://localhost/heute/check_mk/webapi.py?action=get_all_contactgroups&_use… </tt> - + + Furthermore you can add, edit and delete these groups <tt> # All group types can be managed with similar requests # Add - curl "http://localhost/heute/check_mk/webapi.py?action=add_hostgroup&_username=au…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' - curl "http://localhost/heute/check_mk/webapi.py?action=add_servicegroup&_username…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' - curl "http://localhost/heute/check_mk/webapi.py?action=add_contactgroup&_username…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=add_hostgroup&_username=au…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=add_servicegroup&_username…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=add_contactgroup&_username…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' # Edit group - curl "http://localhost/heute/check_mk/webapi.py?action=edit_hostgroup&_username=a…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' - curl "http://localhost/heute/check_mk/webapi.py?action=edit_servicegroup&_usernam…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' - curl "http://localhost/heute/check_mk/webapi.py?action=edit_contactgroup&_usernam…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=edit_hostgroup&_username=a…" -d 'request={"groupname": "hostgroup1", "alias": "the hg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=edit_servicegroup&_usernam…" -d 'request={"groupname": "servicegroup1", "alias": "the sg alias"}' + curl "http://localhost/heute/check_mk/webapi.py?action=edit_contactgroup&_usernam…" -d 'request={"groupname": "contactgroup1", "alias": "the cg alias"}' # Delete group - curl "http://localhost/heute/check_mk/webapi.py?action=delete_hostgroup&_username…" -d 'request={"groupname": "hostgroup1"}' - curl "http://localhost/heute/check_mk/webapi.py?action=delete_servicegroup&_usern…" -d 'request={"groupname": "servicegroup1"}' - curl "http://localhost/heute/check_mk/webapi.py?action=delete_contactgroup&_usern…" -d 'request={"groupname": "contactgroup1"}' + curl "http://localhost/heute/check_mk/webapi.py?action=delete_hostgroup&_username…" -d 'request={"groupname": "hostgroup1"}' + curl "http://localhost/heute/check_mk/webapi.py?action=delete_servicegroup&_usern…" -d 'request={"groupname": "servicegroup1"}' + curl "http://localhost/heute/check_mk/webapi.py?action=delete_contactgroup&_usern…" -d 'request={"groupname": "contactgroup1"}' # For contact groups you may also specify a list of nagvis maps in the extra attribute nagivs_maps

7 years, 7 months

Merge duplicate auth.h

by Sven Panne

Module: check_mk Branch: master Commit: c0917a3b891adfc828459bc153a00a925fe68ce4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0917a3b891adf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 12:15:00 2017 +0100 Merge duplicate auth.h Change-Id: I34adfb84e8d0656a10899361c3c866d3b0469d8f --- livestatus/src/auth.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/livestatus/src/auth.h b/livestatus/src/auth.h index 6a51aea..2d1b0bc 100644 --- a/livestatus/src/auth.h +++ b/livestatus/src/auth.h @@ -26,14 +26,25 @@ #define auth_h #include "config.h" // IWYU pragma: keep + +#ifdef CMC +class Contact; +#else #include "nagios.h" // IWYU pragma: keep +#endif enum class AuthorizationKind { loose = 0, strict = 1 }; +#ifdef CMC +inline Contact *unknown_auth_user() { + return reinterpret_cast<Contact *>(0xdeadbeaf); +} +#else extern AuthorizationKind g_service_authorization; extern AuthorizationKind g_group_authorization; contact *unknown_auth_user(); bool is_authorized_for(contact *ctc, host *hst, service *svc); +#endif #endif // auth_h

7 years, 7 months

updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: 13015c4387886e8ef896894639ebc8ed59ef0e99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13015c4387886e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 2 12:56:05 2017 +0100 updated werk text Change-Id: I34e2c2a998fe1bd0d814d0b5b887b9f68633dfa2 --- .werks/4018 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/4018 b/.werks/4018 index 90402c3..1cf2136 100644 --- a/.werks/4018 +++ b/.werks/4018 @@ -10,15 +10,17 @@ Class: feature A few new functions to manage host, service and contact groups have been introduced. -First of all you can get all groups of a specific type with the url parameter action=get_all_{groupname} + <tt> Example calls: + + +You can get all groups of a specific type with the action get_all_{groupname} curl http://localhost/heute/check_mk/webapi.py?action=get_all_hostgroups&_userna… curl http://localhost/heute/check_mk/webapi.py?action=get_all_servicegroups&_use… curl http://localhost/heute/check_mk/webapi.py?action=get_all_contactgroups&_use… -</tt> Furthermore you can add, edit and delete these groups

7 years, 7 months

Merge duplicate HostListColumn.h

by Sven Panne

Module: check_mk Branch: master Commit: dadd4e421b7f811be7049ded09d7b143bd3156c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dadd4e421b7f81… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 13:02:17 2017 +0100 Merge duplicate HostListColumn.h Change-Id: I040a8d2b57bad0ba74aa0d2275a9b06704ae43c5 --- livestatus/src/HostListColumn.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/livestatus/src/HostListColumn.h b/livestatus/src/HostListColumn.h index 3129116..139a7eb 100644 --- a/livestatus/src/HostListColumn.h +++ b/livestatus/src/HostListColumn.h @@ -29,11 +29,17 @@ #include <memory> #include <string> #include "Column.h" -#include "nagios.h" #include "opids.h" class Filter; class RowRenderer; +#ifdef CMC +#include <unordered_set> +class Host; +#else +#include "nagios.h" +#endif + class HostListColumn : public Column { public: HostListColumn(const std::string &name, const std::string &description, @@ -47,7 +53,11 @@ public: void output(void *row, RowRenderer &r, contact *auth_user) override; std::unique_ptr<Filter> createFilter(RelationalOperator relOp, const std::string &value) override; +#ifdef CMC + std::unordered_set<Host *> *getMembers(void *data); +#else hostsmember *getMembers(void *data); +#endif private: const int _offset;

7 years, 7 months

updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: c4b84bfc03deb5b75ab7ba59038ac75a20008d28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4b84bfc03deb5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 2 12:57:18 2017 +0100 updated werk text Change-Id: Ib8888ffc7b2dc5ce6f0b0869aba853ef18dda7bf --- .werks/4018 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.werks/4018 b/.werks/4018 index 1cf2136..70c05aa 100644 --- a/.werks/4018 +++ b/.werks/4018 @@ -55,3 +55,5 @@ Furthermore you can add, edit and delete these groups curl "http://localhost/heute/check_mk/webapi.py?action=add_contactgroup&_username…" -d 'request={"groupname": "newgroup2", "alias": "the alias", "nagvis_maps": ["dfdf"]}' </tt> + +Please note: A more elaborate version of these new web api calls will be added to our manual soon. :)

7 years, 7 months

Simplified pylint test calls

by Lars Michelsen

Module: check_mk Branch: master Commit: d07d8efb70682010d503c7e7f4b0fff3d3ac30eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d07d8efb706820… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 2 13:01:30 2017 +0100 Simplified pylint test calls Change-Id: I1271ad8ebe6f177cb02a6081c4808d214f84357e --- tests/Makefile | 7 +------ tests/conftest.py | 4 ++-- tests/testlib/__init__.py | 2 +- tests/testlib/pylint_cmk.py | 14 ++------------ 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 78fe27b..56dca32 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -19,12 +19,7 @@ test-pylint: test-pylint-ci: export TERM="linux" ; \ export PYLINT_ARGS="--output-format=cmk_parseable" ; \ - export PYLINT_OUTPUT="$$WORKDIR/pylint.log" ; \ - echo -n > "$$PYLINT_OUTPUT" ; \ - $(MAKE) test-pylint ; \ - echo "### PYLINT LOG ###############################################" ; \ - cat "$$PYLINT_OUTPUT" ; \ - echo "##############################################################" + $(MAKE) test-pylint test-bandit: diff --git a/tests/conftest.py b/tests/conftest.py index 1666bc6..0ae62d3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -83,14 +83,14 @@ def setup_site_and_switch_user(): sys.stdout.write("Switching to site context\n") sys.stdout.write("===============================================\n") - site.switch_to_site_user() + exit_code = site.switch_to_site_user() sys.stdout.write("===============================================\n") sys.stdout.write("Cleaning up after testing\n") sys.stdout.write("===============================================\n") site.rm_if_not_reusing() - sys.exit(0) + sys.exit(exit_code) def _get_site_object(): diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index f3ae0f6..4d4002b 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -460,7 +460,7 @@ class Site(object): def switch_to_site_user(self): cmd = subprocess.list2cmdline(sys.argv + [ cmk_path() + "/tests" ]) args = [ "/usr/bin/sudo", "--", "/bin/su", "-l", self.id, "-c", cmd ] - subprocess.call(args) + return subprocess.call(args) # This opens a currently free TCP port and remembers it in the object for later use diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index ba84684..9169692 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -97,7 +97,6 @@ def run_pylint(base_path, check_files=None, cleanup_test_dir=False): pylint_args = os.environ.get("PYLINT_ARGS", "") if pylint_args: pylint_args += " " - pylint_output = os.environ.get("PYLINT_OUTPUT") pylint_cfg = repo_path() + "/pylintrc" @@ -109,17 +108,8 @@ def run_pylint(base_path, check_files=None, cleanup_test_dir=False): os.putenv("TEST_PATH", repo_path() + "/tests") cmd = "pylint --rcfile=\"%s\" %s%s" % (pylint_cfg, pylint_args, " ".join(check_files)) print("Running pylint with: %s" % cmd) - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, - shell=True, cwd=base_path) - stdout = p.communicate()[0] - - if stdout.strip(): - if pylint_output: - file(pylint_output, "a").write(stdout) - else: - print(stdout) - - exit_code = p.returncode + p = subprocess.Popen(cmd, shell=True, cwd=base_path) + exit_code = p.wait() print("Finished with exit code: %d" % exit_code) if exit_code == 0 and cleanup_test_dir:

7 years, 7 months

← Newer
1
...
37
38
39
40
41
42
43
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017