Gareth J. Greenaway
cf76027a43
Removing wrong import of skipIf
2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
b10e1e7c58
Moving the skipIf for OS X from the beacon state tests to the renderer state tests.
2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
d2fef9ac3f
Disabling beacon state tests on OS X for the time being.
2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
1741bb053b
Adding some timeouts to see if it helps the tests pass on OS X.
2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
fd0ba0aea9
Ensure the user and group used by @with_system_user_and_group are consistent.
2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
e03ab81b99
Using salt.utils.path.which to find false, on OSX it lives under /usr/bin/
2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
353f9d4eb8
Fixing the beacons.reset function. Once the reset has taken place in beacons/__init__.py we need to fire an event back to complete the loop and ensure that everything worked as expected.
2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
ee3cbc7ca5
fix to how the depends decorator works. Only run the dependancy commands for the module we're checking.
2019-06-20 07:04:19 -07:00
Gareth J. Greenaway
8440176992
Fixing a log issue that pops up after test_gen_thin_compression_fallback_py3 on "OS X, need to ensure that salt.utils.thin.os.close is mocked.
2019-06-20 07:04:19 -07:00
Gareth J. Greenaway
9767dddfbf
Format for the sqlite3 databse used for the assistive information changed in Mojave, additional columns added.
2019-06-20 07:04:19 -07:00
Gareth J. Greenaway
9c8a7e6a26
Fixing a bug when the roots fileserver and the location is a symlink to another location. This fix ensures that when fsroot is referenced we are using the real path and not the symlink path.
2019-06-20 07:04:15 -07:00
Megan Wilhite
f5f80af440
Merge pull request #53210 from Ch3LL/cp-52787
...
Cherry-Pick #52787 into 2019.2.1
2019-06-20 09:33:12 -04:00
Megan Wilhite
f27c434029
Merge branch '2019.2.1' into cp-52787
2019-06-19 14:54:14 -04:00
Daniel Wozniak
fd6cb35093
Merge pull request #53467 from twangboy/fix_test_win_file
...
Check valid username first (fixes failing symlink test)
2019-06-19 10:04:29 -07:00
Megan Wilhite
32300788af
Merge pull request #53475 from Ch3LL/add_pypsexec
...
Add pypsexec requirement for cloud tests
2019-06-19 09:30:24 -04:00
Megan Wilhite
bdd7c2c571
Merge pull request #53491 from Ch3LL/crypt_test_mac
...
Update test_gen_hash for macosx
2019-06-19 09:16:02 -04:00
Megan Wilhite
8c2e95233d
Merge pull request #53494 from Ch3LL/do_cloud_test
...
Always delete digital ocean key for test_key_management test
2019-06-19 09:14:50 -04:00
Gareth J. Greenaway
6b6dc66c15
Merge branch '2019.2.1' into cp-52787
2019-06-18 19:37:24 -07:00
Gareth J. Greenaway
85e96bd662
Merge branch '2019.2.1' into crypt_test_mac
2019-06-18 19:37:11 -07:00
Gareth J. Greenaway
2e3778b07f
Merge pull request #53434 from weswhet/patch-2
...
Update documentation for newer mac_service module.
2019-06-18 18:15:18 -07:00
Gareth J. Greenaway
92950c5fc2
Merge branch '2019.2.1' into fix_test_win_file
2019-06-18 17:11:59 -07:00
Gareth J. Greenaway
89398a9049
Update salt.modules.service.rst
2019-06-18 17:10:42 -07:00
Gareth J. Greenaway
b9c1b1a35e
Update salt.modules.service.rst
...
Fixing merge conflict.
2019-06-18 17:07:02 -07:00
Gareth J. Greenaway
a962a64a5f
Merge branch '2019.2.1' into patch-2
2019-06-18 17:02:36 -07:00
Gareth J. Greenaway
5053eabddb
Merge branch '2019.2.1' into do_cloud_test
2019-06-18 16:54:43 -07:00
Gareth J. Greenaway
f72ebba980
Merge pull request #53498 from amendlik/links
...
Fix broken documentation links
2019-06-18 16:44:04 -07:00
Megan Wilhite
1bbdc7f6b2
Merge branch '2019.2.1' into cp-52787
2019-06-18 16:53:57 -04:00
Megan Wilhite
ab59a55d66
Merge branch '2019.2.1' into add_pypsexec
2019-06-18 16:53:52 -04:00
Megan Wilhite
700338ea30
Merge branch '2019.2.1' into crypt_test_mac
2019-06-18 16:53:48 -04:00
Megan Wilhite
64a3e8d5d5
Merge branch '2019.2.1' into do_cloud_test
2019-06-18 16:53:44 -04:00
Shane Lee
6a21edb2c1
Merge branch '2019.2.1' into fix_test_win_file
2019-06-18 14:49:25 -06:00
Gareth J. Greenaway
0793272181
Merge pull request #53514 from Ch3LL/disable_py3_logging
...
Revert logging changes from #53492
2019-06-18 13:49:03 -07:00
Gareth J. Greenaway
b62be1610e
Merge branch '2019.2.1' into cp-52787
2019-06-18 08:26:43 -07:00
Gareth J. Greenaway
4ce7fb1441
Merge branch '2019.2.1' into crypt_test_mac
2019-06-18 08:25:48 -07:00
Ch3LL
8c8f0ac0e4
import six runtests log handler
2019-06-18 09:55:44 -04:00
Ch3LL
f442b338b1
Revert "Enable logging for test runs on py3"
...
This reverts commit 9339425dba
2019-06-18 09:51:50 -04:00
Pedro Algarvio
98285f9824
Merge pull request #53485 from s0undt3ch/hotfix/fix-nox-bypass-2019.2.1
...
[2019.2.1] Workaround nox's install only flag
2019-06-18 10:35:33 +01:00
Megan Wilhite
8622bba3c1
Merge branch '2019.2.1' into cp-52787
2019-06-17 18:31:08 -04:00
Megan Wilhite
832ded687d
Merge branch '2019.2.1' into crypt_test_mac
2019-06-17 18:30:46 -04:00
Megan Wilhite
f9543631bf
Merge branch '2019.2.1' into add_pypsexec
2019-06-17 18:30:34 -04:00
twangboy
31ce1fb0fe
Fix some lint, skip some tests
2019-06-17 15:56:49 -06:00
twangboy
6de4db6b1c
Monkeypatch in the class instead of globally
2019-06-17 15:02:07 -06:00
twangboy
d663a1f8ee
Fix the failing BlockReplace test cases on Windows
...
Many of the functions from the `filemod` module are "namespaced" into
the `win_file` module. That's the file module that gets used on Windows,
so we need to make sure the `check_perms` function from the `win_file`
module is used on Windows.
2019-06-17 15:02:07 -06:00
twangboy
299f88f78e
Update test_managed_contents
2019-06-17 15:02:07 -06:00
twangboy
81110e55ce
Fix test_file_copy_make_dirs that was failing on Linux
...
I wasn't running sudo, but now it tells you that
And verifies that the user is added and the state is run successfully
before continuing with the test
2019-06-17 15:02:07 -06:00
twangboy
8d0529d417
Fix some lint
2019-06-17 15:02:06 -06:00
twangboy
4a9c020787
Fix issues with win_runas
...
modules/file.py: Pass the right parameters to `check_perms` on Windows
platform/win.py: Return actual error on runas failure
platform/win.py: Setup environment for CreateProcessWithLogonW
states/file.py: Pass the right parameters to `file.check_perms` on
Windows
states/zfs.py: Fix __virtual__ so it doesn't stacktrace in Windows
logs
states/zpool.py: Fix __virtual__ so it doesn't stacktrace in Windows
logs
utils/win_runas.py: Cleanup the handles a little better by using some
try/finally blocks.
states/test_file.py: Just use os.mkdir on Windows as the mode is ignored
2019-06-17 15:02:06 -06:00
twangboy
bceffa1d92
Remove privs message
2019-06-17 15:02:06 -06:00
twangboy
54be0a69b1
Verify username early in win_runas
2019-06-17 15:02:06 -06:00
Akmod
ff7370ef86
Merge pull request #53369 from Akm0d/aix_docs
...
Added refs to AIX module documentation
2019-06-17 14:28:59 -06:00
