Bo Maryniuk
9d4960752e
Expand unit test to verify part name
2018-10-09 16:36:53 +02:00
Bo Maryniuk
a6b7d01eb6
Remove linebreak
2018-10-09 16:36:10 +02:00
Bo Maryniuk
5376886875
Keep CPE_NAME only for opensuse series
2018-10-09 16:35:57 +02:00
Bo Maryniuk
8af3904cb6
Add part parsing
2018-10-09 16:35:33 +02:00
rallytime
df11c396ec
Skip pillar refresh test
...
This test is flaky and fails intermittently, even with the `flaky` decoractor.
Skipping for now until we can debug further.
2018-10-09 10:26:45 -04:00
Tao ZHOU
51669173b0
Update ldap3.py
2018-10-09 09:54:36 -04:00
angeloudy
05e55bd3cb
values need to be bytes when writing to ldap
2018-10-09 09:54:25 -04:00
angeloudy
0d749e6e79
values need to be bytes when writing back to ldap
2018-10-09 09:54:19 -04:00
Nicole Thomas
614d1720b9
Merge pull request #49938 from s0undt3ch/2018.3
...
Handle missing `pkg_resources` package
2018-10-09 09:41:09 -04:00
Nicole Thomas
89cbbb63b8
Merge pull request #49934 from rallytime/fix-49925
...
Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation
2018-10-09 09:40:35 -04:00
Nicole Thomas
bce12c368e
Merge pull request #49942 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-10-09 09:38:03 -04:00
Nicole Thomas
a30c0530cd
Merge pull request #49930 from isbm/isbm-osarch-bugfix
...
Get os_family for RPM distros from the RPM macros
2018-10-09 09:31:51 -04:00
Bo Maryniuk
e202b41522
Prevent possible crash if CPE_NAME is wrongly written in the distro
2018-10-09 14:35:35 +02:00
Bo Maryniuk
712083df0e
Add unit test for broken CPE_NAME
2018-10-09 14:11:56 +02:00
Bo Maryniuk
1306ddb111
Add unit test for v2.3 of CPE format
2018-10-09 14:11:42 +02:00
Bo Maryniuk
04b61d3795
Add unit test for WFN format of CPE_NAME
2018-10-09 14:11:23 +02:00
Bo Maryniuk
035690f043
Override VERSION_ID from os-release, if CPE_NAME is given
2018-10-09 14:10:58 +02:00
Bo Maryniuk
08e235b23d
Remove unnecessary linebreak
2018-10-09 14:09:21 +02:00
Bo Maryniuk
853e163109
Add CPE_NAME parsing
2018-10-09 14:08:50 +02:00
rallytime
91534ee04a
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-10-08 16:16:45 -04:00
Pedro Algarvio
b1c292860d
Handle missing pkg_resources package
2018-10-08 18:46:51 +01:00
Daniel Wozniak
99c5dbadd1
Merge pull request #49868 from dwoz/shelltests
...
windows shell tests
2018-10-08 10:32:19 -07:00
rallytime
216fd64013
Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation
...
Fixes #49925
The `event_publisher_pub_hwm` and `salt_event_pub_hwm` configuration options
were removed in #38723 . (They are obsolete and not used within salt any longer.)
When those options were removed, I neglected to remove them from the docs. This
PR cleans up the references in the docs.
2018-10-08 10:51:01 -04:00
Nicole Thomas
1bcadb934b
Merge branch '2018.3' into 2018.3-fix-for-list-compound-targeting
2018-10-08 10:19:35 -04:00
Megan Wilhite
75809b4f8f
Merge pull request #6 from dwoz/win_pkg_flaky
...
Try running fsync to avoid fs caching race condition
2018-10-08 09:35:08 -04:00
Bo Maryniuk
f8a75f1b06
Fix imports
2018-10-08 13:02:50 +02:00
Bo Maryniuk
70d3de0218
Strip and stringify the return for the osarch
2018-10-08 13:00:16 +02:00
Bo Maryniuk
a2483714f7
Get os_family for RPM distros from the RPM macros.
2018-10-08 12:48:24 +02:00
Daniel A. Wozniak
e5ea3f1956
Try running fsync to avoid fs caching race condition
2018-10-06 12:49:49 -07:00
Gareth J. Greenaway
71e53a3021
Cleanup of debugging.
2018-10-06 07:19:19 -07:00
Gareth J. Greenaway
dd96c130fb
Fixing lint.
2018-10-05 22:27:52 -07:00
Gareth J. Greenaway
ac7da89432
Tweaking a couple tests to account for new scenarios with later versions.
2018-10-05 19:04:51 -07:00
Gareth J. Greenaway
4320c43a0f
Removing __mysql_hash_password, no longer needed.
2018-10-05 18:17:08 -07:00
Gareth J. Greenaway
0475acf91a
Removing unnecessary empty line.
2018-10-05 18:16:00 -07:00
Gareth J. Greenaway
9265195deb
Updating the mysql update to handle changes in version 8.0.11 where PASSWORD was removed. Updating unit tests.
2018-10-05 18:06:48 -07:00
Neile Havens
7cebab4a08
Merge branch '2018.3' into optimize-firewalld-state
2018-10-05 16:48:42 -05:00
Megan Wilhite
fd5e8421d6
Merge pull request #5 from dwoz/win_pkg_flaky
...
Log results of cache_dir for now
2018-10-05 17:18:54 -04:00
Daniel A. Wozniak
c3868261ba
Log results of cache_dir for now
2018-10-05 14:16:35 -07:00
Daniel A. Wozniak
9997f45626
Merge branch '2018.3' into shelltests
2018-10-05 11:15:23 -07:00
Daniel Wozniak
eee82d3a87
Merge pull request #49875 from dwoz/win_spm_tests
...
Add spm tests to Windows suite
2018-10-05 11:13:06 -07:00
Megan Wilhite
2cd40583b1
Merge pull request #4 from dwoz/win_pkg_flaky
...
Fix up win_pkg test
2018-10-05 12:27:33 -04:00
Nicole Thomas
327796ec89
Merge pull request #49911 from dubb-b/slack-pr
...
Adding failure messages for PR.
2018-10-05 11:21:41 -04:00
Nicole Thomas
cf1df79fe3
Merge pull request #49900 from dwoz/presence_wart
...
Connect before processing presence
2018-10-05 11:17:55 -04:00
Brett Benassi
57e630c0ae
Adding failure messages for PR.
2018-10-05 08:46:15 -06:00
Nicole Thomas
c0e240461a
Merge pull request #49872 from twangboy/fix_49861
...
Fix issues with windows file permissions when using reset=True
2018-10-05 09:52:06 -04:00
Nicole Thomas
8c4707d2ce
Merge pull request #49899 from twangboy/fix_49892
...
Remove arrInstalled artifact
2018-10-05 09:45:22 -04:00
Nicole Thomas
d3a909f245
Merge pull request #49902 from lomeroe/issue48661_2018.3
...
lgpo better comments on user right assignments
2018-10-05 09:41:15 -04:00
Jochen Breuer
649c46cc4d
Adds check for engine before adding the additional engine argument
...
The additional engine argument is only intended to be used with the
_check_list_minons engine and shouldn't be added for every other engine.
2018-10-05 09:02:15 +02:00
Jochen Breuer
7d0b20c91e
Minor fix for def test_batch_run_grains_targeting
...
item was never "minion" without a colon, but os_grain was overwritten
anyway. So this fix does not actually affect the test outcome.
2018-10-05 09:02:15 +02:00
Jochen Breuer
0d647162e5
Ignore missing minions only when excluding them with 'not'
...
Co-authored-by: Mihai Dinca <Mihai.Dinca@suse.com>
2018-10-05 09:02:14 +02:00
