valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,584 Commits 24 Branches 182 Tags 341 MiB
f7bf038a91
Commit Graph

10139 Commits

Author SHA1 Message Date
Mike Place
3190b88df0 Merge pull request #41559 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-02 10:28:29 -05:00
Nicole Thomas
361fbe629b Merge pull request #41533 from svinota/develop 
unit tests: add pyroute2 interface dict test
 2017-06-01 17:29:07 -06:00
rallytime
833b2145c4 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-01 17:15:36 -06:00
Nicole Thomas
a49348cc89 Merge pull request #41535 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-01 16:25:35 -06:00
rallytime
cb69296f55 Remove test_win_firewall unit tests: they don't actually test anything 2017-06-01 10:07:23 -06:00
Dmitry Kuzmenko
7ba25db473 Replace assertCountEqual not-implemented in Py2 2017-06-01 16:52:09 +03:00
Dmitry Kuzmenko
64954d8e40 Fixed pylint errors. 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
2ae68ee591 Added cache test. 
Implemented some time ago, but forgotten.
 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
4a2406f178 Py3: fixed some tests. 
tls module: convert bytes to string
gzip util: use BytesIO for 'wb' file
django module: ignore arguments order in assert
pillar module: correctly test pillar merge
 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
fef0e0ea67 Catch errors on socket.shutdown. 
It throws an exception if the socket wasn't connected.
 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
2b3276077c Py3: Fixed schema serialization. Enabled tests back. 2017-06-01 16:49:49 +03:00
Peter V. Saveliev
602a7af748 unit tests: test_pyroute2 -- add skipIf 
... and comments

Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-01 10:47:26 +02:00
Peter V. Saveliev
d4939e1ac9 unit tests: add encoding clause into test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-01 07:44:47 +02:00
rallytime
e848c67682 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/states/keystone.py
 2017-05-31 14:39:33 -06:00
Peter V. Saveliev
c744cbefd7 unit tests: fix absolute imports in test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-05-31 22:34:00 +02:00
rallytime
63ea033ec3 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_status.py
  - salt/states/selinux.py
  - tests/unit/modules/test_ssh.py
 2017-05-31 14:29:12 -06:00
Mike Place
06ed4f077b Merge pull request #41337 from Foxlik/2016.11 
Fix #41335 - list index out of range on empty line in authorized_keys
 2017-05-31 14:59:16 -05:00
Peter V. Saveliev
e51e5c7e2f unit tests: add pyroute2 interface dict test 
Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461
 2017-05-31 20:57:44 +02:00
Tomas Zvala
916fecb64f modify ssh_test.py, to check empty lines and comments in authorized_keys #41335 2017-05-31 10:56:02 +02:00
Mike Place
713a671f09 Merge pull request #41471 from terminalmage/blockreplace-test 
Fix a file.blockreplace test for Python 3
 2017-05-30 13:48:22 -05:00
rallytime
8c1dc36a8b Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - salt/utils/parsers.py
 2017-05-30 10:20:44 -06:00
rallytime
675937e0ab Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - tests/unit/states/test_keystone.py
 2017-05-30 10:16:14 -06:00
Nicole Thomas
cbbe1c7c7b Merge pull request #41440 from ecdavis/postgres_schema-respect-opts-test 
postgres_schema: Add support for __opts__['test'] to present and absent states.
 2017-05-30 10:12:35 -06:00
Nicole Thomas
f7411393e4 Merge pull request #41495 from isbm/bp-41405 
Takeover from "rallytime:bp-41405"
 2017-05-30 09:11:43 -06:00
Evan Davis
c2235d23c9 Fix test_absent unit test. 2017-05-26 16:11:17 -07:00
Mike Place
491d4d941a Merge pull request #41430 from DSRCorporation/bugs/py3_tests_nitrogen 
One more bunch of tests fixes.
 2017-05-26 16:53:37 -05:00
Mike Place
1a74084c38 Merge pull request #41463 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-26 16:35:47 -05:00
Mike Place
c345ddf111 Merge pull request #41459 from terminalmage/remove-warning 
Remove iproute/ifconfig warning from test suite startup
 2017-05-26 16:26:20 -05:00
Erik Johnson
4573a9cad5 Fix a file.blockreplace test for Python 3 
This test uses file.accumulated to accumulate data, to be used in the
file.blockreplace state. However, because this data is stored in a
dictionary, the iteration order is different on different versions of
Python. As it is very clearly stated that the accumulator data structure
is a dictionary, rather than modifying the file.accumulated behavior
this commit just updates the test so that it searches for all values
that it should find between the block markers.
 2017-05-26 15:51:38 -05:00
Evan Davis
a186af3bb4 Fix postgres_schema unit tests. 2017-05-26 12:45:51 -07:00
rallytime
9b84b751b2 Pylint fixes 2017-05-26 12:38:38 -06:00
rallytime
ff417db115 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
 2017-05-26 11:27:24 -06:00
Petr Michalec
6db8915021 Endpoint handling per region, fixes #35874 
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
 2017-05-26 11:15:29 -06:00
rallytime
de85b49b90 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/cp.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/gzip_util.py
  - tests/integration/shell/test_cp.py
 2017-05-26 11:11:54 -06:00
Nicole Thomas
5bb9dac9ec Merge pull request #41413 from gtmanfred/nitrogen 
Write tests for Venafi runner
 2017-05-26 10:09:23 -06:00
Nicole Thomas
824f2d3b69 Merge pull request #41398 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-26 09:17:48 -06:00
Erik Johnson
3751881f07 Remove iproute/ifconfig warning from test suite startup 
Recent changes in the test suite no longer rely on listing IPv4
addresses to confirm that the daemons have started, so this warning is
now spurious.
 2017-05-26 08:53:14 -05:00
Daniel Wallace
27d9caac42 tag venafi as destructive and expensive 2017-05-25 15:15:49 -06:00
Mike Place
8bb86813d1 Remove unnecessary pass statement 
For lint.
 2017-05-25 14:31:36 -06:00
Bo Maryniuk
fa5c2c1672 Add UT for unsupported operators 2017-05-25 12:55:46 -06:00
Bo Maryniuk
157b83c05a Lintfixes 2017-05-25 12:55:46 -06:00
Bo Maryniuk
43abd345b2 Add UT for operator conditions 2017-05-25 12:55:46 -06:00
Bo Maryniuk
1053daf2d0 Add UT for typecheck on the output data 2017-05-25 12:55:46 -06:00
Bo Maryniuk
5c1259834f Add UT for None type verification if version has been not passed 2017-05-25 12:55:46 -06:00
Bo Maryniuk
0dd27380b1 Add UT for wildcard finder usage 2017-05-25 12:55:46 -06:00
Bo Maryniuk
5e836a2543 Test the exact methods for matcher 2017-05-25 12:55:46 -06:00
Bo Maryniuk
2af4160a1a Add UT for exact match of the pattern at the beginning 2017-05-25 12:55:46 -06:00
Bo Maryniuk
5a2248d254 Add UT for exact match of the pattern at the end 2017-05-25 12:55:46 -06:00
Bo Maryniuk
334c634826 Add UT to match multiple asterisks 2017-05-25 12:55:46 -06:00
Bo Maryniuk
f73b39fd3c Add UT for matching all versions 2017-05-25 12:55:46 -06:00