Commit Graph

6460 Commits

Author SHA1 Message Date
Pedro Algarvio
aa108d5dd1
Run tests from tox, wether runtests or pytest 2019-01-24 16:58:41 +00:00
Gareth J. Greenaway
c33c5589ca
Backport #50358 to 2017.7 2019-01-18 12:16:03 -08:00
Gareth J. Greenaway
3395a3d185
Merge branch '2017.7' into bugfix-2017.7/ubuntu-networking-searchdomain 2019-01-07 11:52:27 -08:00
Erik Johnson
6dbd81fb4b
Add unit test to ensure we don't diff bare repos
Resolves #38502.
2019-01-02 15:43:16 -06:00
Jason Young
69d25aa696 update debian_ip test 2018-12-17 09:21:20 -08:00
Gareth J. Greenaway
af3e1459c3
Cleanup. 2018-12-14 09:28:44 -08:00
Gareth J. Greenaway
b85c5bf6d9
Adding a test to ensure exception handling is correct. 2018-12-14 09:16:09 -08:00
Mike Place
b1e5f3f887
Merge pull request #50709 from mattLLVW/service_unmask
service.running unmask option
2018-12-10 12:13:31 -07:00
Brandon Ewing
9931a41955
Fix last key detection in pepa key_value_to_tree
pepa.key_value_to_tree only checks the name of the key when attempting
to identify the last key in a flattened key.  This can lead to strange
behavior when the final key name also occurs earlier in the flatkey.

This change explicitly checks that we are the final key in flatkey
prior to setting value.  Test included.

Also see mickep76/pepa#11 and mickep76/pepa#12
2018-12-04 20:35:34 -06:00
matt LLVW
823c4ad0e3 Implement unmask in states.services
Fixes #46014
2018-11-30 21:55:11 +01:00
Gareth J. Greenaway
6b73c7637f
When using file.replace, with the search_only option, if the pattern does not exist in the file then we should return False. 2018-11-28 09:47:24 -08:00
Gareth J. Greenaway
0ec8bcfd2f
When using the gem installed state, when passing a version that includes greater than or less than symbols, ensure that the installed versions meets that requirement. 2018-11-27 14:02:24 -08:00
Daniel A. Wozniak
39e811b296
Add issue url to tests 2018-11-15 12:02:58 -07:00
Daniel A. Wozniak
4f81432321
Set subscribe via sockopt for better compatibility 2018-11-11 02:17:45 -07:00
Daniel A. Wozniak
6882209e3b
More reliable pub server publishing
- Uses existing zmq context
- Store socket in thread local storage for re-use
- Add tests to verify publish reliability
2018-11-11 00:58:47 -07:00
twangboy
7a9278b825
Fix broken tests, add new tests 2018-09-28 14:59:27 -06:00
twangboy
af1ed1c4e3
Add/fix tests
Use named parameters where possible
2018-09-25 16:48:16 -06:00
Gareth J. Greenaway
f4ccc75587
Removing mocking of os.path.join from two tests, one of which was failing when used with coverage argument. No reason we should be mocking os.path.join. 2018-09-18 16:58:48 -06:00
rallytime
0f3881ab4f
Skip flaky test on Python 3
Even with the flaky decorator, this test sometimes passes and sometimes fails.

Let's skip it for now.
2018-09-11 14:15:52 -04:00
Nicole Thomas
cf3d2878f2
Merge branch '2017.7' into fix_win_service 2018-08-30 08:58:32 -04:00
Nicole Thomas
7a166bc58a
Merge pull request #49376 from twangboy/fix_48608
Fix issue with duplicates in user.list_users on OSX
2018-08-30 08:57:54 -04:00
twangboy
535d83e39e
Fix test for list_users 2018-08-29 16:39:10 -06:00
rallytime
7dec9fca0c
Add flaky decorator to serializer test
Fixes https://github.com/saltstack/salt-jenkins/issues/1093
2018-08-29 11:43:11 -04:00
twangboy
1641851175
Fix the name of the _cmd_quote test 2018-08-28 11:16:29 -06:00
twangboy
97567af232
Skip tests on Linux systems 2018-08-28 11:03:34 -06:00
twangboy
38009660e4
Add tests 2018-08-28 11:03:33 -06:00
Daniel A. Wozniak
1c1727e8fd
Fix broken service stop test 2018-08-26 18:34:47 -07:00
Daniel A. Wozniak
913ea5ebde
Fix directory unit test 2018-08-17 14:07:19 -07:00
Daniel A. Wozniak
3363238ff6
Account for normalized dirs in unit tests 2018-08-17 13:17:08 -07:00
rallytime
ed6fb8b739
Merge branch '2017.7.8' into '2017.7'
No conflicts.
2018-08-10 09:08:47 -04:00
rallytime
a43d9b4ba6
Mark a jinja template test as flaky
Fixes https://github.com/saltstack/salt-jenkins/issues/1059
2018-08-09 15:51:34 -04:00
Erik Johnson
0441cd56ef
Add optimization_order to mocking 2018-08-08 11:22:52 -05:00
Erik Johnson
a78663a301
Lint 2018-08-08 11:22:52 -05:00
Erik Johnson
764969ce08
Add a test to confirm that .py files are still loaded correctly
Also, use USE_IMPORTLIB to gate testing on optimization_order, since
this only works with Python 3.5+.
2018-08-08 11:22:52 -05:00
Erik Johnson
e7c10196da
Quiet the byte compiling for PY2 2018-08-08 11:22:52 -05:00
Erik Johnson
9338370477
Add unit tests for loader optimization levels 2018-08-08 11:22:52 -05:00
rallytime
1a23bb233f
Update expected return value in boto test
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
2018-08-08 10:42:57 -04:00
rallytime
d0136b1be5
Update expected return value in boto test
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
2018-08-08 09:16:55 -04:00
Nicole Thomas
801eae3b8d
Merge pull request #48672 from frogunder/45012
add service enabled test
2018-07-23 11:38:48 -04:00
Nicole Thomas
ead19725b6
Merge branch '2017.7' into fix_48169 2018-07-20 10:45:59 -04:00
Frode Gundersen
0747f2e58a
add service enabled test 2018-07-19 16:47:56 +00:00
William Yardley
7ff3c9c5ff
Improve handling of npm json output (#43138)
Rather than look for [ or { at the beginning of a line to identify the json
output, just use salt.utils(.json).findjson.
2018-07-18 21:42:28 -07:00
Nicole Thomas
6973152057
Merge pull request #48534 from xetix/fix-zypper-latest_version
Fix behaviour of function latest_version in zypper module when multip…
2018-07-13 15:56:05 -04:00
Nicole Thomas
9985f0b4c1
Lint: remove extra blank line 2018-07-13 15:55:08 -04:00
Daniel A Wozniak
136ddf5f54
Finally fix prepend for real 2018-07-13 11:25:27 -07:00
Daniel A Wozniak
66b25e65bf
Fix failing prepend test
The prepend test is failing when jenkins runs kithchen but is passing in
my test environment. Make sure each test starts without the 'etc' path
existing.
2018-07-12 19:04:47 -07:00
Patrik
5fbead8a36
Merge branch '2017.7' into fix-zypper-latest_version 2018-07-12 21:05:54 +02:00
xetix
db35d0c1e1 Adding testcase for this fix. 2018-07-12 20:58:16 +02:00
Daniel A Wozniak
c858bf477f
Remove which mock to get the test passing
This test passes in my local kitchen tests when the which mock is
removed. However, I added this mock to try and get the test passing in
jenkins. The original failure that caused me to add it was removed from
jenkins. This will either fix the test or reveal the other error that
needs to be fixed.
2018-07-12 11:14:47 -07:00
Nicole Thomas
a7e52f0de2
Merge pull request #48429 from rallytime/bp-46824
Back-port #46824 to 2017.7
2018-07-03 17:45:36 -04:00