Commit Graph

6181 Commits

Author SHA1 Message Date
Thomas S Hatch
fd3274c800 Merge pull request #35510 from terminalmage/issue33516
Better systemd integration
2016-08-17 12:54:11 -06:00
Erik Johnson
5b5f19d269 Update zypper unit test to reflect call to config.get 2016-08-17 11:43:22 -05:00
Erik Johnson
f83e0ef242 Add unit tests for salt.utils.systemd 2016-08-17 11:30:14 -05:00
Mike Place
9f87081cef Merge pull request #35302 from Ch3LL/add_job_cache_test
Add job cache test
2016-08-17 19:45:28 +09:00
Ch3LL
ccb2a5cadf remove unused imports 2016-08-16 15:21:20 -06:00
Ch3LL
512ae81dfd remove TMP and add integration.TMP 2016-08-16 15:18:24 -06:00
Daniel Wallace
2d8ec1e9db use __opts__ in salt.utils.cloud for cache functions 2016-08-16 12:03:45 -05:00
Thomas S Hatch
240fc12863 Merge pull request #35413 from cachedout/issue_35296
Resolve path issues with cp.push
2016-08-16 10:40:39 -06:00
Mike Place
1473474b04 Merge pull request #35451 from isbm/isbm-zypper-mod_repo-unchanged
Bugfix: zypper mod repo unchanged
2016-08-16 10:38:25 +09:00
Graham McCullough
ae5b233d51 fixes #34279 2016-08-15 14:34:20 -07:00
Bo Maryniuk
8790197d86 Fix Unit test for suppressing the exception removal on non-modified repos 2016-08-15 17:35:25 +02:00
Mike Place
3646cf1afa Additional checks on master and integration test 2016-08-12 20:06:20 +09:00
Mike Place
fc0d5878bc Set file_recv on test master 2016-08-12 19:08:27 +09:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359)
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
2016-08-11 10:45:24 -06:00
Ch3LL
c9b7c3cf80 need to add returners option in other places 2016-08-09 13:53:42 -06:00
Erik Johnson
243909f39d file.recurse: Do not convert octal mode string to int (#35309)
* Add integration test for #34945

* file.recurse: Do not convert octal mode string to int

When we run file.makedirs_perms to create the dest directory, we pass
through the mode to file.check_perms. However, file.check_perms expects
an octal string, not an int. This causes the initial directory to be
chmod'ed to the wrong mode. When there are files in the source
directory, file.recurse will invoke the file.directory state to manage
files/dirs in that directory, and this ends up correcting the mode as we
simply pass the dir_mode to it. However, when there are only directories
in the source directory, this never happens and the incorrect mode
remains on the destination directory.

Fixes #34945.
2016-08-09 13:02:26 -06:00
Ch3LL
7316df7a02 fix pylint 2016-08-09 10:35:01 -06:00
Ch3LL
50a4f0fe6a fix comment 2016-08-09 09:26:51 -06:00
Erik Johnson
d621aa7b61 Update runner/wheel unit tests to reflect new key in ret dict 2016-08-09 08:49:52 -05:00
Ch3LL
6837acf742 add job cache integration tests 2016-08-08 17:01:02 -06:00
Erik Johnson
e2e8bbbfde Add integration test for #35214 2016-08-05 20:47:24 -05:00
rallytime
35696ad637 Pylint fix 2016-07-27 15:12:41 -06:00
Mike Place
f9fd6ddd8a Fixup #33875 2016-07-27 13:25:59 -06:00
Eu
56b1f6c651 Fix naive fileserver map diff algorithm
Naively comparing sorted dict keys does not guarantee that maps are equal. We
must compare mtimes for filenames in case keys are the same to make sure there
isnt a modified file.
2016-07-27 13:24:19 -06:00
Mike Place
b58c663d8d Merge pull request #34991 from cachedout/ssh_timeout
SSH timeout
2016-07-27 11:24:37 -06:00
Mike Place
5f8370ae8d Refine errors in client (#34976)
* Refine errors in client

Check for the existence of cache data

* Adjust tests for new return string
2016-07-27 11:05:31 -06:00
Mike Place
39cd8da399 Lint diff against salt-testing 2016-07-27 10:42:44 -06:00
Mike Place
443e5cdde2 Add timeout to ssh tests 2016-07-27 10:40:02 -06:00
Mike Place
8becec2f4f Backport #34906 2016-07-22 17:22:50 -06:00
Erik Johnson
1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (#34869)
* Add git.diff function

* Fail git.latest states with uncommitted changes when force_reset=False

Also, discard these changes when running the state if force_reset=True.

* Add integration test for case where there are uncommitted changes
2016-07-22 09:04:05 -06:00
Mike Place
b4be66dedf Fix wheel test
Fix random ordering bug
2016-07-21 13:54:32 -06:00
Justin Anderson
9abb6f91bb Skip mysql state test if mysqladmin is not available 2016-07-20 09:24:24 -06: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
Bo Maryniuk
5ed5142fbc Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:12:03 +02: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
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
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
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
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
Justin Anderson
b2616833b0 Some small changes 2016-07-11 14:35:25 -06:00
rallytime
f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test 2016-07-07 21:29:36 -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
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
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
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
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
twangboy
78f7c530bb Remove unit tests, integration tests written 2016-07-05 15:12:34 -06:00
rallytime
55a91e22be Merge branch '2015.5' into '2015.8'
No conflicts.
2016-07-05 09:13:50 -06:00
Mike Place
8c72ee56e4 Merge pull request #34435 from cachedout/backport_config_dir_integration
Backport change to integraiton test suite
2016-07-05 08:24:53 -06:00
Mike Place
0e2c71a537 Backport change to integraiton test suite
Will avoid lint errors in earlier branches. Thanks to @terminalmage for pointing out my error.
2016-07-01 16:10:34 -06:00
Mike Place
45b8fb10d7 Merge pull request #34373 from jtand/network_state_integration_test
Network state integration test
2016-06-30 08:05:44 -07:00
Erik Johnson
d6af1de0b7 Optimize pkg integration tests and add a couple new tests (#34377)
* Remove redundant usage of destructiveTest decorator

* Remove unnecessary SLS file

This simple state can be run using run_state

* Explicitly order tests

* Use run_state instead of invoking state.sls

* Ensure only one refresh_db done during pkg integration tests

* Add pkg.latest test for package without an epoch

* Optimize pkg.latest_version usage in pkg integration tests

* Clarify outcome when only_upgrade is used

* Add pkg.latest test with only_upgrade=True
2016-06-30 10:48:22 -04:00
Justin Anderson
1d24053e36 network.system sls file 2016-06-29 14:31:46 -06:00
Justin Anderson
4a9e6af542 network.routes sls file 2016-06-29 14:31:07 -06:00
Justin Anderson
76c90b2ef6 network.managed sls file 2016-06-29 14:30:23 -06:00
Justin Anderson
84a36369fa Added network state integration test 2016-06-29 14:28:36 -06:00
Nicole Thomas
94e094652c Back-port #34324 to 2015.8 (#34344)
* Add test to match against custom grains

* Lint

* Forgot to add custom grain
2016-06-28 16:35:32 -04:00
Erik Johnson
f6bd1ad47e Revert py3modernize lint changes (#34339)
* salt/__init__.py: revert py3modernize lint changes

* salt/cloud/clouds/vmware.py: revert py3modernize lint changes

* salt/modules/jboss7_cli.py: revert py3modernize lint changes

* salt/payload.py: revert py3modernize lint changes

* salt/serializers/yamlex.py: revert py3modernize lint changes

* salt/states/win_servermanager.py: use absolute imports

* salt/utils/args.py: revert py3modernize lint changes

* salt/utils/decorators/__init__.py: use __name__ instead of func_name

__name__ is py3-compatible and also works on builtins in py2, which
func_name does not.

* salt/utils/compat.py: revert py3modernize lint changes

* salt/utils/__init__.py: revert py3modernize lint changes

* salt/version.py: revert py3modernize lint changes

* tests/salt-tcpdump.py: revert py3modernize lint changes
2016-06-28 16:04:02 -04:00
Mike Place
046bdaa9f2 Merge pull request #34306 from ghedo/iptables_flush_table
Fix iptables.flush state: Do not force 'filter' table when flushing
2016-06-28 12:03:14 -07:00
Erik Johnson
b793426c23 Remove unnecessarily-disabled sanity check (#34325)
This was commented out for reasons having nothing to do with anything
else going on in 0c069dd. Uncommenting this sanity check so that we are
notified if we need to update our targets in the future.
2016-06-28 11:12:55 -04:00
Alessandro Ghedini
882c6c9c86 Do not force 'filter' table when flushing
The "table" argument is already part of the function signature, this means
that flush() will always force the "filter" table even when the user sets
a different one.
2016-06-28 15:40:50 +01:00
Mike Place
65c5675a3f Merge pull request #34257 from rallytime/fix-34037
Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer
2016-06-24 10:25:04 -07:00
rallytime
d7a5e9b10e Remove test that doesn't actually test anything 2016-06-24 09:10:13 -06:00
Mike Place
cb5399787c Merge pull request #34136 from meaksh/salt-suse-os-detection-2015.8
Fixed behavior for SUSE OS grains in 2015.8
2016-06-23 13:24:58 -07:00
rallytime
8e36e90966 Merge branch '2015.5' into '2015.8'
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
2016-06-21 14:47:23 -06:00
Mike Place
3669048654 Merge pull request #34077 from rallytime/grains-tests
Add some grains targeting tests
2016-06-21 09:06:30 -07:00
rallytime
2199bb8a78 Add integration tests for grains.append 2016-06-20 16:44:22 -06:00
Justin Anderson
b7ac6c735a Moved imports to top, out of _get_moto_version function 2016-06-20 13:20:43 -06:00
Justin Anderson
02f9ba99ba Updated version check. Moved check into it's own function 2016-06-20 10:33:13 -06:00
Justin Anderson
d445026c56 Updated test to work with new moto version. Changed strings to unicode 2016-06-20 09:26:39 -06:00
Pablo Suárez Hernández
97f1958863 some cleanup and renaming 2016-06-20 15:47:34 +01:00
Pablo Suárez Hernández
548971bdc9 Fix for SUSE OS grains in 2015.8 2016-06-20 13:13:00 +01:00
Justin Findlay
6d0d52fa86 modules.pkg int tests: skip refresh_db upon error (#34072) 2016-06-17 09:35:47 -06:00
rallytime
37cfe70724 Add some grains targeting tests 2016-06-16 17:02:46 -06:00
rallytime
60561ac6fc Add a test to check for disconnected minion messaging 2016-06-16 14:07:05 -06:00
rallytime
77f44f3087 Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - tests/integration/output/output.py
2016-06-14 15:47:35 -06:00
Nicole Thomas
871f7966ce Lint fix for #34000 (#34005) 2016-06-14 11:12:14 -04:00
Mike Place
f758e42172 Fix incorrectly written test (#34000)
This should be using the test suite method of generating opts
2016-06-14 11:10:21 -04:00
Mike Place
9bd2317992 Merge pull request #33951 from jfindlay/gem_tests
modules.gem int tests: more fixes
2016-06-13 17:46:43 -07:00
Mike Place
53baae6eb1 Merge pull request #33984 from jfindlay/disk_capacity
Add docs and tests to disk state
2016-06-13 17:43:38 -07:00
Mike Place
fa5efb6a69 Merge pull request #33985 from rallytime/more-batch-tests
Write some more simple batch command tests
2016-06-13 17:38:05 -07:00
rallytime
3e7ab8c7b3 Write some more simple batch command tests 2016-06-13 16:25:19 -06:00
Justin Findlay
6cbe31e6c2 states.disk: rewrite unit tests 2016-06-13 16:13:40 -06:00
Justin Findlay
6080846cce acl.ClientACL: add unit tests (#33684) 2016-06-13 16:00:35 -04:00
Justin Findlay
2eb633ccad modules.gem int tests: only check known installed gems 2016-06-13 11:33:25 -06:00
Justin Findlay
9f3e18b037 modules.gem int tests: (un)install a non-core gem 2016-06-13 10:46:56 -06:00
Mike Place
378dd7ca06 Merge pull request #33888 from jfindlay/random_check
random.org checks
2016-06-10 08:45:07 -07:00
Justin Findlay
82f95429db modules.random_org unit tests: skip if random.org down 2016-06-08 20:46:20 -06:00
rallytime
b8e4706074 Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/modules/saltutil.py
  - salt/states/archive.py
2016-06-08 14:26:18 -06:00
Mike Place
f7b3d0eda0 Merge pull request #33839 from cachedout/fix_pkgresource_test_stacktrace
Fix another unit test stacktrace in pkg_resource
2016-06-08 06:32:55 -07:00
Mike Place
5f081ef31c Merge pull request #33840 from cachedout/remove_matcher_unit_tests
Remove matcher tests
2016-06-08 06:31:41 -07:00