valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,616 Commits 24 Branches 182 Tags 341 MiB
26b23b37bc
Commit Graph

6061 Commits

Author SHA1 Message Date
twangboy
26b23b37bc
Skip test if missing binaries 2017-09-26 15:51:22 -06:00
Nicole Thomas
2581098595 Merge pull request #43731 from twangboy/win_unit_beacons_test_status 
Fix `unit.beacons.test_status` for Windows
 2017-09-26 12:25:11 -04:00
Nicole Thomas
10f3d47498 Merge pull request #43724 from brejoc/2017.7.kubernetes_delete_test 
Improved delete_deployment test for kubernetes module
 2017-09-26 12:19:30 -04:00
Nicole Thomas
13cc27bdab Merge pull request #43734 from twangboy/win_unit_test_poudriere 
Fix `unit.modules.test_poudriere` for Windows
 2017-09-26 10:13:46 -04:00
Erik Johnson
d78b9a3294 Merge pull request #41998 from twangboy/win_unit_test_environ 
Fix `unit.modules.test_environ` for Windows
 2017-09-26 07:25:48 -05:00
twangboy
922e60fa67
Add os agnostic paths 2017-09-25 15:25:31 -06:00
twangboy
dc1b36b7e2
Change expected return for Windows 2017-09-25 15:06:44 -06:00
twangboy
d73ef44cf6
Mock with uppercase KEY 2017-09-25 09:37:15 -06:00
twangboy
048e16883f
Use uppercase KEY 2017-09-25 09:37:15 -06:00
twangboy
056f3bb4c0
Use with to open temp file 2017-09-25 09:35:25 -06:00
twangboy
716e99c453
Fix py3 bytestring problems 2017-09-25 09:35:24 -06:00
twangboy
543610570c
Fix bytestring issues, fix errored tests 2017-09-25 09:35:24 -06:00
twangboy
9fe83a34a5
Remove old variable declaration 2017-09-25 09:35:23 -06:00
twangboy
c5cf5e92c1
Fix many tests 2017-09-25 09:35:23 -06:00
Jochen Breuer
85b0a8c401 Improved delete_deployment test for kubernetes module 
This is a follow up of this PR: https://github.com/saltstack/salt/pull/43235

With the fix in PR 43235, we are polling the status of the deletion via
show_deployment. This is now also reflected in the tests with this change.
 2017-09-25 17:29:27 +02:00
rallytime
cbae45bec4
Lint: Remove extra line at end of file 2017-09-22 10:33:10 -04:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/utils/test_parsers.py
 2017-09-22 09:40:03 -04:00
Mike Place
e6dc4d64df Merge pull request #43314 from twangboy/win_fix_unit.utils.test_verify 
Fix `unit.utils.test_verify` for Windows
 2017-09-21 16:26:12 -06:00
Jochen Breuer
96f39a420b Fixed linting 
Fix for "String format call with un-indexed curly braces".
 2017-09-20 16:35:01 +02:00
Jochen Breuer
08fba98735 Fixed several issues with the test 
* Removed redundant import.
* No longer inheriting from LogSettingsParserTests.
* Replaced test class description with somethin meaninful.
* Fixed identation.

I've also moved the class to the bottom, since all the classes inheriting
from LogSettingsParserTests are in the block above.
 2017-09-20 15:37:24 +02:00
Jochen Breuer
3a089e450f Added tests for pid-file deletion in DaemonMixIn 
This is a follow up on this PR:
https://github.com/saltstack/salt/pull/43366

Since we can get an OSError durin PIDfile deletion with non-root users, it
would make sense to also test for this. So here are the two test cases.
One with an OSError and the other one without.
 2017-09-20 14:34:30 +02:00
Jochen Breuer
d1b5ec098c Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module 2017-09-19 10:44:31 +02:00
Nicole Thomas
9ada7f626c Merge branch '2017.7' into win_fix_unit.utils.test_verify 2017-09-13 14:22:38 -04:00
Erik Johnson
4243a2211d Rewrite the reactor unit tests 
These have been skipped for a while now because they didn't work
correctly. The old tests have been scrapped in favor of new ones that
test both the old and new config schema.
 2017-09-13 10:35:23 -05:00
Mike Place
08d102c869 Merge pull request #41943 from twangboy/win_unit_test_local_cache 
Fix `unit.returners.test_local_cache` for Windows
 2017-09-11 15:34:02 -06:00
Mike Place
50ab79f0cb Merge pull request #43424 from twangboy/win_unit_test_hosts 
Fix `unit.modules.test_hosts` for Windows
 2017-09-11 15:28:41 -06:00
Mike Place
ca091bc8a4 Merge pull request #43438 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-11 12:33:38 -06:00
twangboy
c0dc3f73ef Use sys.platform instead of salt.utils to detect Windows 2017-09-11 12:22:06 -06:00
twangboy
e496d28cbf Fix unit.utils.test_verify for Windows 
Use Windows api to get and set the maxstdio
Change messages to work with Windows
 2017-09-11 12:22:06 -06:00
Mike Place
a9592dd3e2 Merge pull request #43320 from twangboy/win_fix_alternatives 
Fix `unit.modules.test_alternatives` for Windows
 2017-09-11 11:27:59 -06:00
Mike Place
9b89e49846 Merge pull request #43363 from twangboy/scratch_ini_tests 
Fix `unit.modules.test_ini_manage` for Windows
 2017-09-11 11:10:30 -06:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
Mike Place
e89e23a32e Merge pull request #43422 from twangboy/win_unit_cloud_ec2 
Fix `unit.cloud.clouds.test_ec2` for Windows
 2017-09-11 09:17:19 -06:00
twangboy
90dcf8287c Fix unit.modules.test_hosts for Windows 
Fix problem with TmpStringIO Class on Windows. The module uses this
class twice in normal operation. In Windows there's an additional run
before the real runs where it is opened with mode='w'. This causes the
data to be wiped out. So, this sets it to only save the value in the
instance to data if it is not empty.

Use the windows path to the hosts file in Windows
 2017-09-08 17:21:01 -06:00
twangboy
b2cea18d13 Fix unit.modules.test_gem for Windows 
Mock `salt.utils.is_windows` to return False so the test will run on
Windows
 2017-09-08 15:53:07 -06:00
twangboy
1379627334 Fix unit.cloud.clouds.test_ec2 for Windows 
Mock instead of create tempfile
 2017-09-08 15:36:52 -06:00
Alessandro -oggei- Ogier
496f14a7e7 forgot to mock the proper one 2017-09-08 21:37:09 +02:00
Nicole Thomas
97f05ff603 Merge pull request #43398 from twangboy/win_fix_test_mount 
Fix `unit.modules.test_mount` for Windows
 2017-09-08 09:39:28 -04:00
Nicole Thomas
6a4cc5c1b0 Merge pull request #43399 from twangboy/win_fix_test_pam 
Fix `unit.modules.test_pam` for Windows
 2017-09-08 09:37:49 -04:00
Nicole Thomas
2b5cfae3f8 Merge pull request #43400 from twangboy/win_unit_test_parted 
Fix `unit.modules.test_parted` for Windows
 2017-09-08 09:36:59 -04:00
Nicole Thomas
332deeb013 Merge pull request #43401 from twangboy/win_unit_test_pw_group 
Fix `unit.modules.test_pw_group` for Windows
 2017-09-08 09:35:44 -04:00
Nicole Thomas
c0f54bfef1 Merge pull request #43402 from twangboy/win_unit_test_qemu_nbd 
Fix `unit.modules.test_qemu_nbd` for Windows
 2017-09-08 09:34:57 -04:00
Alessandro -oggei- Ogier
70642e495d better qemu_static parameter mangle in deboostrap management, tests 2017-09-08 10:17:32 +02:00
twangboy
6ceb895a84 Use os.path.join for paths 2017-09-07 16:51:10 -06:00
twangboy
531ce8022b Fix unit.modules.test_qemu_nbd for Windows 
Use os.sep
 2017-09-07 15:44:35 -06:00
twangboy
78e39a1b9d Fix unit.modules.test_pw_group for Windows 
Skip `test_info` and `test_getent` because they require grp which is not
available on Windows
 2017-09-07 15:34:57 -06:00
twangboy
8e3e897ee2 Fix unit.modules.test_parted for Windows 
Mock salt.utils.is_windows to be False so that the __virtual__ tests
will run
 2017-09-07 15:27:11 -06:00
twangboy
6257aa964a Fix unit.modules.test_pam for Windows 
Mocks os.path.exists
 2017-09-07 15:18:14 -06:00
twangboy
4a8d7e522c Fix tests, Use full path to salt.utils.which 2017-09-07 14:41:56 -06:00
Nicole Thomas
6106aec696 Merge pull request #43356 from gtmanfred/2016.11 
never-download got readded
 2017-09-07 13:46:04 -04:00