11 Commits

Author	SHA1	Message	Date
Nicole Thomas	b74c41611f	Merge branch 'develop' into kapacitor_enhancements	2018-03-08 10:47:58 -05:00
Ahmed AbouZaid	820a399fd3	fix dbrps assert	2018-03-08 10:20:35 +01:00
Ahmed AbouZaid	0a9d87b42f	pylint compliance	2018-03-08 02:43:40 +01:00
Ahmed AbouZaid	f8d824092a	add dbrps to main kapacitor test	2018-03-08 01:35:02 +01:00
Bo Maryniuk	274135ae5e	Add unicode_literals and print_function	2018-01-26 14:09:58 +01:00
rallytime	ccf790a83f	Update all references for moved functions to use "files" util ... - fopen - flopen - fpopen - safe_rm - is_empty - is_fcntl_available	2017-07-18 10:31:01 -06:00
Pedro Algarvio	d397763553	Adjust to the new LoaderModuleMockMixin usage	2017-03-28 19:03:59 +01:00
Pedro Algarvio	9b1e55aa85	Import the full module namespace to avoid import shadowing. ... https://github.com/saltstack/salt/pull/39996#issuecomment-287857698	2017-03-28 19:02:47 +01:00
Pedro Algarvio	1f7a0aa65b	Proper mocking	2017-03-28 19:00:51 +01:00
Pedro Algarvio	3beb3fb801	Move whatever we need from salttesting to salt. ... Let's drop the salttesting dependency cycle.	2017-02-28 22:52:49 +00:00
Pedro Algarvio	15af4c9728	Test filenames conformity. Adjust for pytest.	2017-02-23 23:19:42 +00:00