Gareth J. Greenaway
08fce29653
Silly typo in test.
2018-03-10 06:23:00 -08:00
Gareth J. Greenaway
84d720b14c
Adding some code that was accidently reverted back in.
2018-03-10 06:21:47 -08:00
Gareth J. Greenaway
2c43911f62
Fixing lint.
2018-03-10 06:01:01 -08:00
Gareth J. Greenaway
e813b74fbe
Update test_x509.py
...
Lint fixes.
2018-03-10 06:01:00 -08:00
Gareth J. Greenaway
1d57787a6f
Gating the two tests that require m2crypto to be available.
2018-03-10 06:01:00 -08:00
Gareth J. Greenaway
70aca0da57
Recent unicode changes into Oxygen broke some aspects of the x509 module. When processing PEM text, it needs to be treated as ascii not unicode. Adding a couple tests for affected functions.
2018-03-10 06:01:00 -08:00
Gareth J. Greenaway
ab02ffd4ae
Swapping out import-error for unused-import.
2018-03-09 07:13:27 -08:00
Gareth J. Greenaway
e6c9740a7d
Gating nacl tests to ensure libnacl is installed.
2018-03-08 10:06:58 -08:00
Gareth J. Greenaway
4ae2861d68
Fixing a few bugs introducted following the move to unicode all the things. Adding deprecation notices for the previously used key and key_file arguments. Adding deprecation into Release notes. Adding some tests for Naccl module and runner to test encryption and decryption.
2018-03-08 10:06:55 -08:00
Nicole Thomas
5ffa482343
Merge pull request #46285 from gtmanfred/2018.3.0rc1
...
fix return dict for salt-ssh if something goes wrong
2018-03-02 12:17:42 -05:00
Nicole Thomas
5416fcf6dc
Merge pull request #46275 from terminalmage/issue46274
...
Make sure rest_cherrypy's config is all str types on PY2
2018-03-02 12:15:33 -05:00
Erik Johnson
aeeb533225
Fix master conf test for PY3
...
PY3 should have no non-unicode strings, this was a bug in the test
2018-03-02 11:06:13 -06:00
Daniel Wallace
417e45686b
add unit test
2018-03-02 07:48:26 -07:00
Dmitry Kuzmenko
51c311bc1c
Payload Py3 fix and set handling.
2018-03-02 06:01:42 +03:00
Erik Johnson
2f7ae45088
Add conf file unicode test for master
2018-03-01 13:43:33 -06:00
Nicole Thomas
dc2833aa87
Merge branch '2018.3.0rc1' into bugs/46202_msgpack_custom_types_rework
2018-03-01 10:47:07 -05:00
Dmitry Kuzmenko
a664864ab1
Rework msgpack serialization of unsupported types in serial
2018-03-01 02:16:31 +03:00
Dmitry Kuzmenko
4dfc44ac39
A basic fix for loading datetime objects with msgpack
2018-02-28 23:05:51 +03:00
Nicole Thomas
faa90cc6c2
Merge pull request #46213 from terminalmage/unicode-opts
...
PY2: Remove conversion of values from config file to str types
2018-02-28 14:10:19 -05:00
Erik Johnson
a7575aed67
Add unit test for config loading
2018-02-28 08:44:15 -06:00
Nicole Thomas
04c53f4cc4
Merge pull request #46217 from gtmanfred/2018.3.0rc1
...
fix ssh integration test with enable_ssh_minions
2018-02-28 09:32:21 -05:00
Nicole Thomas
32a0561ca8
Merge pull request #46223 from rallytime/bp-46221
...
Back-port #46221 to 2018.3.0rc1
2018-02-27 17:15:13 -05:00
Erik Johnson
13abc175e1
Fix hanging tests in integration suite
...
A recent change to nginx appears to be causing this test to fail to
cache the test file in the temp nginx instance we've spun up. This
causes the return of cp.cache_file to be False, which in and of itself
should be enough to fail the test. But since we're not asserting on the
cp.cache_file results, flow proceeds to the next block of code, in which
we open the "file" that we cached. Some genius thought it would be a
swell idea to make io.open() successfully open a filehandle when the
path passed to it is a boolean False. When you try to read from this
filehandle, an AMAZING thing happens... It just blocks. Forever. I know,
right? Pure genius.
This commit adds an assert so that the test fails gracefully and doesn't
try to read from a bogus filehandle that SHOULDN'T EVEN EXIST.
2018-02-27 14:58:36 -05:00
Daniel Wallace
0d340757ad
fix ssh integration test with enable_ssh_minions
...
Fix for MacOS
2018-02-27 10:34:54 -07:00
Bo Maryniuk
f00cf88c7b
Fix unit test for socket data
2018-02-26 15:04:49 +01:00
Daniel Wallace
667b5b9f0c
fix unicode for mac autologin test
2018-02-23 17:00:56 -07:00
Nicole Thomas
e6374bf68d
Merge pull request #46149 from rallytime/bp-46145
...
Back-port #46145 to oxygen.rc1
2018-02-22 16:57:51 -05:00
rallytime
29468f3dce
Lint fixes
2018-02-22 14:18:28 -05:00
Erik Johnson
2b887dd77d
Update tests to reflect changes to the SaltCacheLoader
2018-02-22 10:51:36 -05:00
Nicole Thomas
6b5b56d302
Merge pull request #46146 from terminalmage/update-version-2018.3.0
...
Update refrences to Oxygen codename to 2018.3.0
2018-02-22 09:26:01 -05:00
Nicole Thomas
391f45b5cd
Merge pull request #46005 from gtmanfred/ssh
...
pass opts to SSHClient for enable_ssh_minions
2018-02-22 09:10:44 -05:00
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0
2018-02-21 21:47:41 -06:00
Gareth J. Greenaway
0d4647c2dd
Removing unnecessary log.
2018-02-21 13:14:05 -08:00
Gareth J. Greenaway
2df1866cc1
Adding a internal reset function to scheduler. Calling reset between schedule tests to ensure schedule is empty and it is using defaults.
2018-02-21 13:00:19 -08:00
Daniel Wallace
53d969a152
mark orch test as flaky
2018-02-21 09:41:57 -07:00
Nicole Thomas
0e63decaac
Merge pull request #46117 from Ch3LL/mac_ssh_schema
...
Add stringutils.to_str in test_roster_config_validate test
2018-02-21 09:57:44 -05:00
Nicole Thomas
a50bb41849
Merge pull request #46110 from isbm/isbm-iscsii-master-nonroot
...
IQN check for iSCSII crash on non-root Master
2018-02-21 09:56:53 -05:00
Bo Maryniuk
1b75f98a91
Catch proper exception type
2018-02-21 13:11:44 +01:00
Bo Maryniuk
5149cdbbd9
Fix unit test for py3
2018-02-21 10:53:20 +01:00
Daniel Wallace
9ce14b2a12
pass opts to SSHClient for enable_ssh_minions
...
Also, use ckminions to get the minions from the roster, instead of doing it in
publish.
2018-02-20 16:06:00 -07:00
Nicole Thomas
772636f67a
Merge pull request #46084 from garethgreenaway/oxygen_swap_to_datetime_objects
...
[oxygen] swap scheduler to use datetime objects
2018-02-20 17:51:26 -05:00
Nicole Thomas
8f245ea62e
Merge pull request #46069 from rallytime/bp-46036
...
Back-port #46036 to oxygen.rc1
2018-02-20 17:50:17 -05:00
Nicole Thomas
551f7a6280
Merge pull request #46057 from terminalmage/unicode-normalization
...
Add unicode normalization support to data/stringutils helpers
2018-02-20 16:26:09 -05:00
Ch3LL
1fd0295cca
Add stringutils.to_str in test_roster_config_validate test
2018-02-20 16:22:15 -05:00
Nicole Thomas
0dc8d17540
Merge pull request #46104 from isbm/isbm-x509fixonfix
...
x509 fix update
2018-02-20 16:08:23 -05:00
Nicole Thomas
7088438930
Merge pull request #46002 from isbm/isbm-zeromq17-deprecationwarning
...
Pyzmq 17.0.0 proper handling
2018-02-20 16:07:06 -05:00
Gareth J. Greenaway
e8b0e64bf5
Removing debugging code
2018-02-20 11:11:24 -08:00
Gareth J. Greenaway
5a90e6db9e
merge conflict
2018-02-20 10:42:40 -08:00
Gareth J. Greenaway
1a636b1c71
Fixing typo. swapping out a format string for an additional with datetime.timedelta.
2018-02-20 10:34:57 -08:00
Gareth J. Greenaway
b5bde4e904
Fixing cron based schedule logic up. Removing debugging messages.
2018-02-20 10:34:56 -08:00
