Nicole Thomas
7d6b9ed0a5
Merge pull request #48803 from dmurphy18/aix_filesystems
...
Support for execution modules and states mount on AIX
2018-08-09 13:51:54 -04:00
Nicole Thomas
9b6a9ff4f1
Merge pull request #48932 from twangboy/fix_win_repo
...
Fix pkg.install when pkg already installed
2018-08-09 13:45:50 -04:00
David Murphy
92818f816b
Fixes for testing
2018-08-08 12:15:59 -06:00
David Murphy
77dd7a1743
Adjust unit tests
2018-08-08 12:15:59 -06:00
David Murphy
9fb5641dc7
Mount unit tests for modules and states for AIX
2018-08-08 12:15:59 -06:00
David Murphy
b28f427432
Save off work after laptop issue
2018-08-08 12:15:59 -06:00
rallytime
9f0b9a1073
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:44:38 -04:00
Nicole Thomas
ab1a713bc3
Merge pull request #48934 from terminalmage/issue48777
...
Properly handle latin-1 encoding in file diffs
2018-08-07 17:02:23 -04:00
twangboy
47b2898a85
return empty dict on no changes
2018-08-07 12:25:15 -06:00
Erik Johnson
52c64e4d51
Fix to_unicode test
...
Since latin-1 is not being automatically decoded, we need to explicitly
pass it on the test.
2018-08-07 09:57:21 -05:00
twangboy
6532706d2f
Make the tests run on Linux
2018-08-06 17:55:46 -06:00
twangboy
cfe55a391a
Add tests for pkg.install output
2018-08-06 17:53:37 -06:00
Erik Johnson
d39fa889f3
Add stringutils.get_diff to mocks
2018-08-06 15:27:13 -05:00
Erik Johnson
f14f4dae22
Add unit test for latin-1 fallback, multi-encoding
2018-08-03 18:38:08 -05:00
Nicole Thomas
0272cadff8
Merge branch '2018.3' into unit_state
2018-08-03 16:30:28 -04:00
Ch3LL
b82dd708be
skip getpwnam check on mac in unit test_cmdmod
2018-08-02 16:39:49 -04:00
Ch3LL
5896c7fc36
remove base_top_file file in teardown and add sleep
2018-08-02 16:05:41 -04:00
Gareth J. Greenaway
0791b0a03c
FileGrepTestCase tests back to 2018.3
2018-07-31 09:33:58 -07:00
Gareth J. Greenaway
2e01c55e7e
Fixing a bug that prevents specifying wildcards for filenames.
2018-07-31 09:33:58 -07:00
Daniel Wozniak
69f81214d1
Merge pull request #48714 from dwoz/state_echo_fix
...
Always transfer bytes from fileserver roots
2018-07-30 15:37:12 -07:00
Daniel A. Wozniak
ce3ed43dab
Always use unix line endings
2018-07-30 11:41:58 -07:00
Erik Johnson
52fc1c955d
Simplify file contents in roots fileserver test
...
This removes the need to hard code contents in the test. The roots
fileserver just reads from the file in binary mode, so we should be able
to do the same in the test to confirm the correct behavior of the roots
backend.
2018-07-27 09:16:59 -05:00
Nicole Thomas
6978ce5d1d
Merge pull request #48747 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-07-26 14:14:33 -04:00
Daniel A Wozniak
a89019e956
Multiple windows test fixes
2018-07-24 23:09:14 -07:00
rallytime
4122da40b5
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- tests/integration/netapi/rest_tornado/test_app.py
- tests/integration/states/test_service.py
2018-07-24 14:28:33 -04:00
Nicole Thomas
062fe7cccf
Merge pull request #48718 from garethgreenaway/48536_beacon_diskusage_fixes
...
[2018.3] beacon diskusage fixes
2018-07-24 13:45:25 -04:00
Nicole Thomas
e873621009
Merge pull request #48711 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-07-24 13:38:57 -04:00
Daniel Wozniak
04ab17a4d6
Merge pull request #48726 from dwoz/syslogtest
...
Skip test when syslog not available
2018-07-24 09:12:44 -07:00
Daniel A. Wozniak
6e7824266b
Windows compatible cp test
2018-07-23 23:27:29 -07:00
Daniel A. Wozniak
00f04cfd59
Skip test when syslog not available
2018-07-23 23:11:42 -07:00
Daniel A. Wozniak
95329acb1e
Fileserver transfers bytes
2018-07-23 13:24:47 -07:00
Gareth J. Greenaway
38a65e8fb3
Fixing test_diskusage_nomatch and test_diskusage_match_regex
2018-07-23 11:02:57 -07:00
Gareth J. Greenaway
6ecca166ff
Updating psutil.disk_partitions to pull in all mounts not just the physical ones. Check to see if the mount point from the configuration ends with a $ (regular expression end of line) if not we add one in to ensure that a simple / does not end up matching all mount points. Updating tests accordingly.
2018-07-23 11:02:57 -07:00
Nicole Thomas
801eae3b8d
Merge pull request #48672 from frogunder/45012
...
add service enabled test
2018-07-23 11:38:48 -04:00
rallytime
ea5c063237
Update old utils paths to use new paths
2018-07-23 11:32:08 -04:00
rallytime
e740d3b208
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/client/ssh/state.py
- salt/client/ssh/wrapper/state.py
- salt/modules/dockermod.py
- salt/modules/npm.py
- salt/modules/testinframod.py
- tests/integration/modules/test_mac_system.py
- tests/integration/modules/test_mac_timezone.py
- tests/integration/ssh/test_state.py
- tests/integration/states/test_user.py
- tests/unit/modules/test_npm.py
- tests/unit/states/test_file.py
2018-07-23 11:15:43 -04:00
Alexander Duryagin
ebcd3b1c6b
fixed test for svn.export
2018-07-23 10:58:48 -04:00
Nicole Thomas
ead19725b6
Merge branch '2017.7' into fix_48169
2018-07-20 10:45:59 -04:00
Nicole Thomas
dfc1582475
Merge pull request #48304 from Ch3LL/swap_mac
...
Fix macosx grains when swapusage returns comma
2018-07-20 10:30:58 -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
Nicole Thomas
4b16537a29
Merge pull request #48579 from Ch3LL/fix_syslog
...
Fix python2 syslog returner expecting string bytes not unicode
2018-07-13 15:50:15 -04:00
Daniel A Wozniak
136ddf5f54
Finally fix prepend for real
2018-07-13 11:25:27 -07:00
Ch3LL
d8288a0ffc
add unicode type for syslog test for tag
2018-07-13 12:39:09 -04:00
Ch3LL
17e69382d5
Fix python2 syslog returner expecting string bytes not unicode
2018-07-13 12:35:41 -04: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
