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
rallytime
487458ad4b
Update old utils paths to use new utils paths
2018-07-27 11:57:34 -04:00
rallytime
436510796f
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-07-27 11:44:07 -04: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
Erik Johnson
b6f73e8e57
Remove trailing whitespace on what should be a blank line
2018-07-27 09:15:05 -05:00
Nicole Thomas
8e61f3dce0
Merge pull request #48742 from frogunder/45014
...
add windows integration tests for states.file
2018-07-27 09:57:26 -04:00
William Giokas
d4ca0e3a97
test: except for OSError only
2018-07-26 17:27:02 -04:00
Frode Gundersen
f08058b043
Merge branch '45014' of https://github.com/frogunder/salt into 45014
2018-07-26 20:09:17 +00:00
Frode Gundersen
33c20c1ec0
fix tests
2018-07-26 20:04:51 +00: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
Nicole Thomas
f2ef2d3ef6
Merge pull request #48752 from garethgreenaway/fix_state_file_all_integers
...
[2018.3] Fix when state file is integers
2018-07-25 11:03:01 -04:00
Daniel A Wozniak
a89019e956
Multiple windows test fixes
2018-07-24 23:09:14 -07:00
Gareth J. Greenaway
790801c67e
Fixing a case where the state module would fail if the state file being passed was all integers. Added a new tests for this edge case.
2018-07-24 14:00:37 -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
Frode Gundersen
757fde70c6
Merge branch '2017.7' into 45014
2018-07-24 11:07:14 -06:00
Frode Gundersen
a7a914060d
add windows integration tests for states.file
2018-07-24 16:42:07 +00: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
Nicole Thomas
ce4e22224e
Merge pull request #48720 from Ch3LL/mac_file_path
...
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
2018-07-23 18:32:56 -04:00
Daniel A. Wozniak
95329acb1e
Fileserver transfers bytes
2018-07-23 13:24:47 -07:00
Ch3LL
01d25fae19
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
2018-07-23 15:02:27 -04:00
Ch3LL
f44a2fc349
Enable service if disabled before running state service tests
2018-07-23 14:05:31 -04: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
rallytime
7332cce567
[2017.7] Mark some tornado tests as flaky
2018-07-23 12:53:26 -04:00
Daniel A Wozniak
aa34a80997
Always trasfer bytes from fileserver roots
...
Fixes a state test on windows (py3) where utf-8 data was getting
improperly decoded before fileserver sends the data to a client.
2018-07-23 09:43:45 -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
Mike Place
689c231d2b
Merge pull request #48691 from Ch3LL/win_repo_pkg_test
...
Add windows pkg module integration tests
2018-07-22 14:01:29 -06:00
Daniel A. Wozniak
d731e6bf8e
Call sync_all to fix Windows test case
2018-07-21 18:00:59 -07:00
Ch3LL
4b7d6d80c5
Remove unnecessary jinja in curl.sls file
2018-07-20 14:32:14 -04:00
Nicole Thomas
85991680c8
Merge pull request #48345 from twangboy/fix_48169
...
Fix behavior of powercfg module and state
2018-07-20 13:37:12 -04:00
Ch3LL
2bedadfadb
Add windows pkg module integration tests
2018-07-20 12:47:37 -04:00
Nicole Thomas
96447ce541
Merge pull request #48656 from Ch3LL/windows_ip_mod
...
Add windows ip module integration tests
2018-07-20 10:57:44 -04:00
Nicole Thomas
ead19725b6
Merge branch '2017.7' into fix_48169
2018-07-20 10:45:59 -04:00
Nicole Thomas
1ebd96d909
Merge pull request #48664 from Ch3LL/srv_disable_mac
...
[2017.7] Fix service.disabled test for macosx
2018-07-20 10:32:55 -04:00
Nicole Thomas
4e77b242f2
Merge pull request #48663 from Ch3LL/srv_disable_mac_2018
...
[2018.3] Fix service.disabled test for macosx
2018-07-20 10:32:21 -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
Nicole Thomas
33812f78f1
Merge pull request #48673 from Ch3LL/mac_port
...
Use different pub and ret ports for testprogram integration tests
2018-07-20 10:11:51 -04:00
Nicole Thomas
5f6a7c4d89
Merge pull request #48675 from Ch3LL/mac_disable
...
Fix mac service.disable tests
2018-07-20 10:09:40 -04:00
Ch3LL
c78efab828
Fix mac service.disable tests
2018-07-19 14:15:58 -04:00
Ch3LL
87dd85a220
Use different pub and ret ports for testprogram integration tests
2018-07-19 13:07:27 -04:00
Frode Gundersen
0747f2e58a
add service enabled test
2018-07-19 16:47:56 +00:00
