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
71,790 Commits 24 Branches 182 Tags 341 MiB
bb38055ae4
Commit Graph

7750 Commits

Author SHA1 Message Date
twangboy
5bcb27e477 Fix integration tests on windows 2016-07-20 10:00:29 -06:00
Justin Anderson
9abb6f91bb Skip mysql state test if mysqladmin is not available 2016-07-20 09:24:24 -06:00
Mike Place
62ef8fdb35 Merge pull request #34670 from isbm/isbm-osmajorrelease-grain-suse 
Add "osmajorrelease" grain (2016.3)
 2016-07-20 08:39:38 -06:00
Mike Place
aff29906fc Merge pull request #34671 from isbm/isbm-osmajorrelease-grain-suse-devel 
Add "osmajorrelease" grain
 2016-07-20 08:35:34 -06:00
Mike Place
b986c35a88 Merge pull request #34794 from rallytime/reneable-pam-test 
Renable the pam execution module unit test
 2016-07-20 08:05:50 -06:00
Mike Place
b7fe952427 Remove test for file dir behavior 
Refs #34809
 2016-07-20 08:04:00 -06:00
rallytime
d68b60bff8 Renable the pam execution module unit test 
The logic wasn't correct on the skipIF. We want these test to run
when sys.platform.startswith('OpenBSD') is False.
 2016-07-19 16:15:12 -06:00
Mike Place
8b3b2cfe69 Merge pull request #34268 from DSRCompany/features/23194_publisher_acl_globing 
Regex support in publisher ACL rules.
 2016-07-19 15:37:06 -06:00
Mike Place
3eb49d35cc Merge pull request #34786 from rallytime/iteritems-tests-dir 
Remove all object.iteritems() references from the tests/ directory
 2016-07-19 14:57:21 -06:00
twangboy
f960ded780 Gate SIGINT in shutdown routines for Windows 
SIGINT not available in Windows
 2016-07-19 13:48:03 -07:00
twangboy
c5245f6b24 Fix stack trace on Jenkins 2016-07-19 10:04:24 -07:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-19 10:31:07 -06:00
rallytime
7b0ad25b09 Remove iteritems() references from unit/transport/*.py files 2016-07-19 10:22:33 -06:00
rallytime
0ad8183973 Remove iteritems() references from unit/modules/*.py 2016-07-19 10:18:26 -06:00
rallytime
c8930339d3 Remove iteritems() references from integration tests 2016-07-19 10:15:23 -06:00
Bo Maryniuk
038d2c3087 Fix group-add tests for SUSE 2016-07-19 18:01:37 +02:00
Bo Maryniuk
110a422d5a Keep osmajorrelease as a string type for 2016.3 release 2016-07-19 17:52:08 +02:00
rallytime
3e032dc397 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-19 09:30:45 -06:00
twangboy
b1014cdefb Add code to kill process in Windows 2016-07-18 13:01:44 -07:00
Mike Place
10a1af9949 Remove unnedeed config test (#34751) 
Refs #34607
 2016-07-18 13:00:47 -06:00
Mike Place
46901c6e65 Disable test 
There's a race condition in here somewhere. Disabling and tracking issue elsewhere.
 2016-07-18 12:39:49 -06:00
rallytime
0baf92a972 Remove tests that were deleted in develop already 2016-07-18 11:14:21 -06:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
 2016-07-18 10:34:03 -06:00
Justin Anderson
b94e0dd95a ipset.long_range doesn't need a docstring 2016-07-18 10:32:32 -06:00
Dmitry Kuzmenko
27017e34ce Regex support in publisher ACL rules. 
Users in publisher ACL and users and functions in the publisher ACL
blacklist now have matched in the following order:
1. Equality
2. Glob
3. Regex

Users in publisher ACL still not supported in systems without pwd python
module (Windows, any else?)
 2016-07-18 19:15:28 +03:00
Bo Maryniuk
3cb6940904 Bugfix: access 'osmajorrelease' as an integer value 2016-07-18 17:14:57 +02:00
Mike Place
4625ee65b8 Remove unnedeed config test 
Refs #34607
 2016-07-18 09:12:18 -06:00
Mike Place
0452d0a0ec Lint 2016-07-18 06:45:57 -06:00
Nicole Thomas
2a3df50223 Merge pull request #34724 from rallytime/test-fix-34270 
Update mock value to match change in #34270.
 2016-07-16 14:06:04 -06:00
rallytime
f667b936e5 Update mock value to match change in #34270. 
Fixes the failing test in #34270
 2016-07-16 14:03:37 -06:00
Mike Place
1b3742c41b Merge pull request #34599 from meaksh/salt-snapper-module 
Snapper execution module and state for Salt
 2016-07-16 13:43:06 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
Mike Place
e918aba3c3 Merge pull request #34704 from babilen/influxdb-current 
Influxdb current
 2016-07-16 12:39:22 -06:00
Wolodja Wentland
87b54170aa Rename InfluxDB states and modules for 0.8 
InfluxDB versions newer than 0.8 introduced significant changes in
database concepts, user administration and Python API.

We therefore decided to rename the old InfluxDB states to 'influxdb08*'
and to reserve the 'influxdb' name for InfluxDB 0.9+ compatible states
and modules.
 2016-07-16 09:46:44 +02:00
Mike Place
b11fd8ef6a Merge pull request #34484 from dmacvicar/docker_images 
[WIP] Creating Docker images with pure Salt and running Salt commands inside containers
 2016-07-15 16:17:59 -06:00
Mike Place
99e638ab40 Merge pull request #34686 from rallytime/fix-doc-test 
CLI Example doc additions to fix the sysmod test failure
 2016-07-15 15:22:07 -06:00
Bo Maryniuk
e5c3195fa3 Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:14:27 +02:00
Bo Maryniuk
96021e257c Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:13:58 +02:00
Bo Maryniuk
5ed5142fbc Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:12:03 +02:00
rallytime
8b8e2a1dc3 CLI Example doc additions to fix the sysmod test failure 2016-07-14 17:34:02 -06:00
rallytime
f20e78b534 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-14 15:35:21 -06:00
rallytime
bb2c43b52a Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-14 14:10:10 -06:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-14 14:06:42 -06:00
Mike Place
64a154826a Revert "Modify lodaer global test to use populated dunders" 
This reverts commit f45dbe8508df70ce3f563915318791614449b341.
 2016-07-14 12:11:44 -06:00
Bo Maryniuk
2040c7caa5 Add unit test for osmajorrelease grain 2016-07-14 18:08:15 +02:00
Bo Maryniuk
208fd33b48 Add unit test for osmajorrelease grain 2016-07-14 18:05:12 +02:00
Mike Place
eadae09e0a Merge pull request #34563 from rallytime/py3-state-unit-tests 
Py3 fixes for running unit tests in the unit/states/ directory.
 2016-07-14 08:28:49 -06:00
Nicole Thomas
bc63f25a6f Lint 34644 (#34651) 
* Better error handling for __virtual__ in dockerng module

* Modify lodaer global test to use populated dunders

This prevents a number of errors in the error log and makes for a
more robust test IMHO

* Lint #34644
 2016-07-13 18:58:54 -04:00
Mike Place
50360263c5 Adjust the mine test a little bit to give it a better chance of success (#34647) 2016-07-13 16:51:28 -04:00
Mike Place
9b88d3a1e2 Add interface to all configs 
This got removed during the attempt to make the tests run on Windows.

I added them everywhere even though that's not strictly necessary.

Without these set on the master and sub_master, Windows will throw
erorrs because the networking stack will decide that anything that's
bound to 0.0.0.0 represents an extestential threat to any socket that
attempts to *connect* to one of those ports. (For...reasons.)
 2016-07-13 11:24:33 -06:00
twangboy
1f6f4b29f0 Add tcp_master settings to both masters 2016-07-13 11:24:33 -06:00
twangboy
6dc0eb842c Add more info to --interactive report 2016-07-13 11:24:33 -06:00
twangboy
82bc69896e Cleans up config parameters 2016-07-13 11:24:33 -06:00
twangboy
2dbd5d4e92 Add cachedir for minions and syndic 2016-07-13 11:24:33 -06:00
twangboy
1cb52a7abb Remove backtick 2016-07-13 11:24:33 -06:00
twangboy
131df72a6f Remove configuration from configs 2016-07-13 11:24:33 -06:00
twangboy
23193b08e1 Check actual minion ports 
For some reason this fixed the PYTHONPATH issue
 2016-07-13 11:24:33 -06:00
twangboy
e1a42174d8 Remove redundant tcp_pull_port entry for minion 2016-07-13 11:24:33 -06:00
twangboy
4cbb679550 Add more descriptive report for interactive mode 2016-07-13 11:24:33 -06:00
twangboy
66c58ddaf1 Fix lint 2016-07-13 11:24:33 -06:00
twangboy
291f6369a7 Fix mem leak caused by pki_dir 2016-07-13 11:24:33 -06:00
twangboy
7030c925cc Make additional changes to master configs 2016-07-13 11:24:33 -06:00
twangboy
05629c8efb Fix master and sub_minion configs 2016-07-13 11:24:32 -06:00
twangboy
074fd4a8be Fix configs, remove default values 2016-07-13 11:24:32 -06:00
twangboy
f4b3c969d1 Add Pedro's suggestions 2016-07-13 11:24:32 -06:00
twangboy
528d0d2bb5 Fix subminion 2016-07-13 11:24:32 -06:00
twangboy
2636014ccf Fix integration tests on windows 2016-07-13 11:24:32 -06:00
twangboy
c9d435734f Add Pedro's suggestions 2016-07-13 11:24:32 -06:00
twangboy
a28e0782e5 Fix subminion 2016-07-13 11:24:32 -06:00
twangboy
dbd8482eb5 Fix integration tests on windows 2016-07-13 11:24:32 -06:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
Mike Place
3e612c3794 Merge pull request #34618 from jtand/network_integration_fix 
Network state integration test test=True
 2016-07-13 10:30:15 -06:00
Anthony Shaw
7786c0020c Libcloud DNS module fix (#34628) 
* add test module

* add broken test

* fix typo in config dictionary

* remove call to unused function, add called_with assertion
 2016-07-13 11:47:20 -04:00
Megan Wilhite
f6dfbac5ca add num_cpus grain to freebsd (#34565) 
* add num_cpus grain to freebsd

* fix pylint
 2016-07-13 11:40:09 -04:00
Anthony Shaw
4c61769024 add test module 2016-07-13 13:46:04 +10:00
Justin Anderson
445f8afc69 Fixes failing test on Suse Leap (#34621) 2016-07-12 18:48:06 -04:00
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
 2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
rallytime
3026df346f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-12 13:27:16 -06:00
Nicole Thomas
b90ae407f9 Add support for edge case when Cmd and Entrypoint can't be blanked (#34593) 2016-07-12 15:18:53 -04:00
Justin Anderson
57df38e685 Update github IP for ssh state integration tests (#34592) 2016-07-12 15:17:41 -04:00
Nicole Thomas
357649313a Avoid circular imports when calling salt.utils functions (#34586) 
Also remove unused imports:
  - platform
  - hashlib.md5
  - salt.utils.process.MultiprocessingProcess
  - tornado.concurrent
 2016-07-12 15:13:57 -04:00
Nicole Thomas
efc2ab9d68 [2016.3] Avoid salt.utils circular imports when using "from" (#34585) 
Also removes an unused import
 2016-07-12 15:13:26 -04:00
Justin Anderson
34bcf9ccfc Changed network state test to use test=True 2016-07-12 12:40:40 -06:00
Nicole Thomas
2e1007254b Avoid circular imports when calling salt.utils functions (#34584) 2016-07-12 13:41:30 -04:00
Justin Anderson
7dd8035c62 Gate docker unit test to check for docker (#34591) 
* Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
 2016-07-12 13:33:31 -04:00
Pablo Suárez Hernández
c00991bc1e Fix for pylint: W1699 2016-07-12 15:38:28 +01:00
Pablo Suárez Hernández
5213ddeab9 Fix in inline comments 2016-07-12 15:10:25 +01:00
Duncan Mac-Vicar P
b60f76b836 pylint: W1699(incompatible-py3-code) 2016-07-12 15:44:01 +02:00
Pablo Suárez Hernández
867bfbf353 Variable renaming. Pylint fixes 2016-07-12 14:03:52 +01:00
Duncan Mac-Vicar P
cfdb1c3928 typo 2016-07-12 14:38:22 +02:00
Duncan Mac-Vicar P
1f77336a1d test that fix /tmp is not used 2016-07-12 14:37:47 +02:00
Pablo Suárez Hernández
5c06e91417 pylint: some fixes 2016-07-12 12:24:04 +01:00
Pablo Suárez Hernández
39e8ff0f25 pylint fixes 2016-07-12 11:03:09 +01:00
Pablo Suárez Hernández
0a9dbfc33a unit test for snapper.diff with binary file 2016-07-12 09:02:31 +01:00
rallytime
9f5e275f2e When writing strings to tmp files, use bytes for Python 3 2016-07-11 16:07:35 -06:00
Justin Anderson
b2616833b0 Some small changes 2016-07-11 14:35:25 -06:00
rallytime
640d8bb5b2 Pylint fixes 2016-07-11 14:26:06 -06:00
rallytime
de93203bf5 Remove object.iteritems() call from boto_elasticsearch_domain_test 
Also, clean up imports in that file and remove stray ` character from
boto_apigateway state from previous commit.
 2016-07-11 14:26:06 -06:00
rallytime
2a5dab3c56 Use six.iteritems(object) in boto_s3_bucket module and boto_s3_bucket_test 2016-07-11 14:26:06 -06:00
rallytime
1f21dfc555 Fix unit.states.kmod_test to pass when running in Py3 
The join function adds each list item in different orders, resulting
in a failing state comment comparison. This is inaccurate behavior.
 2016-07-11 14:26:06 -06:00
rallytime
6b7a305a1b Rename dockerio.py unit tests to dockerio_test.py 
These tests have never run automatically because of an incorrect file name.

Added a skipIf on these tests as they are currently non-functioning and the
module they're testing has been deprecated.
 2016-07-11 14:26:06 -06:00
rallytime
e6f875cd62 Remove izip import from unit.modules.boto_apigateway_test.py 
Use six compatible version of zip instead
 2016-07-11 14:26:06 -06:00
Mike Place
a733b844be Fixup unit test for archive module 2016-07-11 11:59:00 -06:00
Pablo Suárez Hernández
964d5cbf03 fix diff unit test while creating text file 2016-07-11 16:15:11 +01:00
Pablo Suarez Hernandez
f77551b883 more unit tests 2016-07-11 16:47:49 +02:00
Mike Place
915652165f Merge pull request #34542 from rallytime/stringio-migrations 
Migrate StringIO imports to use the six library for Python2/3 compatibility
 2016-07-08 10:47:04 -06:00
rallytime
815c8b38d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-08 10:34:32 -06:00
rallytime
c539333924 Use six.moves.StringIO() 2016-07-08 09:30:58 -06:00
rallytime
f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test 2016-07-07 21:29:36 -06:00
rallytime
1f4a75f268 Move StringIO import to use six for tests.unit.modules.zypper_test.py 2016-07-07 19:27:30 -06:00
rallytime
ceefb6e34c Rename tests.unit.simple to tests.unit.simple_test 
These tests are not getting run automatically in a ./runtests.py -u
or on Jenkins runs. This name changes allows them to run automatically.
 2016-07-07 17:12:27 -06:00
rallytime
7c216c3a1d Fix the unit.grains.core_test tests to run with Python3 2016-07-07 16:41:21 -06:00
Mike Place
6b8c76af83 Prevent many errors in the test suite in loader tests (#34521) 
Pack in what the loader needs.
 2016-07-07 17:03:45 -04:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
Mike Place
685df80929 Merge pull request #34518 from terminalmage/fix-pkg.latest-test 
Fix pkg.latest integration test for non-LTS ubuntu
 2016-07-07 13:29:13 -06:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
Justin Anderson
ed59113e94 Change network state integration test to use test=True 2016-07-07 12:27:18 -06:00
Erik Johnson
4aef44ecdf Fix pkg.latest integration test for non-LTS ubuntu 
This test uses ``pkg.list_upgrades`` to find a package which it assumes is
installed, to test ``pkg.installed`` with ``only_upgrade=True``. The
problem with that approach is that ``pkg.list_upgrades`` uses a dry-run
of an ``apt-get dist-upgrade`` to find the upgrades. On non-LTS Ubuntu
releases, a ``dist-upgrade`` results in upgrading to an entirely new
Ubuntu release, and new packages which would be installed by the
dist-upgrade (but are not currently installed) will be included in the
return data. This causes the test to fail when we attempt to run
``pkg.latest`` with ``only_upgrade=True`` on a package which is not
already installed.

This commit fixes the test by ensuring that our target package is
already installed, and continuing to iterate through the return data
from ``pkg.list_upgrades`` until a currently-installed package is found.
 2016-07-07 12:51:01 -05:00
Mike Place
4c75d4f92b Integration test for grains data in templatized files (#34487) 
Refs #34433
 2016-07-07 12:16:35 -04:00
Nicole Thomas
3ebba020b6 Rename some unit test files by adding _test (#34503) 
These two test files are currently not running automatically on Jenkins.
Renaming these files will add them to the full runtests.py run.
 2016-07-07 12:05:08 -04:00
Justin Anderson
75299456be Use skipTest for network state integration test (#34489) 
* Updated skipTest to check for debian or redhat

* Removed skipIf import
 2016-07-06 13:43:09 -04:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
 2016-07-06 09:12:25 -06:00
Duncan Mac-Vicar P
59d8ce480e implement keyword arguments for dockerng.call 2016-07-06 14:11:17 +02:00
Duncan Mac-Vicar P
d3ee81c561 testcase for call 2016-07-06 11:49:39 +02:00
Bo Maryniuk
d1c2d5aaaa Lintfix 2016-07-06 10:09:14 +02:00
Bo Maryniuk
88ab5f4755 Fix Python3 compat (StringIO) 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f1d0961e69 Fix boolean comparison 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f275378e24 Add unit test for update an object 2016-07-06 10:09:14 +02:00
Bo Maryniuk
6174f4ad4a Fix imports 2016-07-06 10:09:14 +02:00
Bo Maryniuk
bf9ba65489 Add unit test for deleting objects 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1ce88be0ef Add unit test for criteria matcher 2016-07-06 10:09:14 +02:00
Bo Maryniuk
a20019d859 Add unit test for "matches" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
844eefd758 Add unit test for "less than" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
fac88ac41b Add unit test for "equals" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1dfe81bfe6 Add unit test for "more than" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
99848659c9 Add unit test on getting objects 2016-07-06 10:09:14 +02:00
Bo Maryniuk
bc1a8b7e45 Accept content in Writer 2016-07-06 10:09:14 +02:00
Bo Maryniuk
c4c2ac7e70 Add object storing unit test 2016-07-06 10:09:14 +02:00
Bo Maryniuk
8e537ccc9e Reset data in Writable 2016-07-06 10:09:14 +02:00
Bo Maryniuk
c744aa1caf Add unit test for database listing 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f7dc2b9c84 Add unit test for object validation 2016-07-06 10:09:14 +02:00
Bo Maryniuk
234e342aa7 Add unit test for object serialization 2016-07-06 10:09:14 +02:00
Bo Maryniuk
0a177297f4 Rename Writable class 2016-07-06 10:09:14 +02:00
Bo Maryniuk
8927d6fef6 Rename "TestEntity" as it accidentally picked by PyTest 2016-07-06 10:09:14 +02:00
Bo Maryniuk
4c7e4d36b7 Fix docstring 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1df6b0a6a9 Add test creating table 2016-07-06 10:09:14 +02:00
Bo Maryniuk
54e5655e11 Add unit test for database close 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f9c40170e5 Add initial tests for fsdb 2016-07-06 10:09:14 +02:00
Bo Maryniuk
eff3f4ef66 Fix broken tests: add os.mkdir mocking 2016-07-06 10:09:14 +02:00