valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,468 Commits 24 Branches 182 Tags 341 MiB
bd58650af2
Commit Graph

4775 Commits

Author SHA1 Message Date
rallytime
bd58650af2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - tests/unit/netapi/rest_tornado/test_handlers.py
  - tests/utils/__init__.py
 2016-10-25 10:39:02 -06:00
Pablo Suárez Hernández
32f44b43ee Fix Zypper module and tests for Carbon 2016-10-25 11:08:00 +01:00
Mike Place
a6a24c2b3b
Workaround for tornado test startup error 2016-10-25 16:45:32 +09:00
Mike Place
88bcfa2c0a
Fix TCP test 2016-10-25 16:42:50 +09:00
Mike Place
0aab883180
Merge branch '2016.3' into 3_carbon 2016-10-25 16:13:44 +09:00
Mike Place
c4393d5e9e
Address transport test hang 
It would appear that if an attribute error is raised when trying to detect a class atter,
that the test suite does not run the class teardown method but continues regardless. This
fixes the class attr error which then allows the teardown to run. Prior to this, if the
teardown did not run, the entire suite would hang out shutdown because it was blocked
on waiting for a ioloop to terminate.
 2016-10-25 13:16:35 +09:00
rallytime
063ddfd7ce Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-24 10:16:17 -06:00
Nicole Thomas
d7e28d24a4 Pylint fix for 2016.3 (#37186) 
Refs #37175
 2016-10-24 09:42:41 -06:00
rallytime
027e2212c9 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/status.py
  - salt/modules/win_status.py
  - salt/modules/zypper.py
  - salt/utils/network.py
  - tests/unit/transport/zeromq_test.py
 2016-10-24 09:29:53 -06:00
Mike Place
0d7af935e5 Merge pull request #37175 from cachedout/fix_test_hange 
Fix test hang
 2016-10-24 18:55:37 +09:00
Mike Place
0fecb5ff2e
Remove sleep. Thanks @s0undt3ch 2016-10-24 18:38:49 +09:00
Mike Place
cedc609503
Fix test suite hang on salt testing 
We don't need to clean up here since the test suite will handle it for us.
 2016-10-24 15:52:33 +09:00
Mike Place
c5d81a8ade Merge pull request #37158 from jfindlay/mac_skip_uptime 
add mock for `status.uptime` unit test
 2016-10-24 12:13:53 +09:00
rallytime
8fff95b3b4 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/gpg.py
  - salt/modules/zypper.py
 2016-10-21 16:09:17 -06:00
Justin Findlay
094eac06eb modules.status.uptime unit test: mock on linux 2016-10-21 15:50:42 -06:00
rallytime
caa8fc9169 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/deb/salt-api.service
  - pkg/deb/salt-master.service
  - salt/client/__init__.py
  - salt/fileclient.py
  - salt/modules/cp.py
  - salt/modules/status.py
  - tests/integration/__init__.py
  - tests/integration/modules/cp.py
 2016-10-21 15:50:03 -06:00
Dmitry Kuzmenko
4695619599 Updated host_to_ip to return all the IPs instead of the first one. 
This fixes the bug #36866 where minion gets __master_disconnected right
after connect because '::1' isn't in the list of connected masters that
is ['127.0.0.1'].
 2016-10-20 18:15:27 +03:00
Pablo Suárez Hernández
01b0a6917c Minor pylint fixes 2016-10-20 11:33:11 +01:00
Pablo Suárez Hernández
7dbb0bd252 Unit tests fixes 2016-10-20 10:59:48 +01:00
Mike Place
d7aebd1877
Remove unnecessary sleep from unit.utils.process_test.TestProcessManager.test_restarting 2016-10-20 14:29:10 +09:00
Pablo Suárez Hernández
a092a974da Refactor: Cleanup and pylint fixes 2016-10-19 14:57:03 +01:00
Pablo Suárez Hernández
1331ae5c72 Unit tests for zypper upgrade and dist-upgrade 2016-10-19 13:21:55 +01:00
twangboy
b3b688e298 Fix tests 2016-10-17 13:31:55 -06:00
rallytime
112dc5d9c1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cli/salt.py
  - salt/client/__init__.py
  - salt/modules/archive.py
  - tests/integration/modules/pkg.py
 2016-10-14 12:03:08 -06:00
Thomas S Hatch
6b782c15e1 Merge pull request #36755 from terminalmage/issue36671 
systemd.py: check retcode for service availability in systemd >= 231
 2016-10-13 13:41:50 -06:00
rallytime
1e7f56c4bb Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-13 10:38:19 -06:00
Nicole Thomas
a8eee6e90b Update the ip to test against in unit.utils.network_test.NetworkTestCase.test_host_to_ip (#36975) 2016-10-13 10:25:58 -06:00
Nicole Thomas
3ac9ced202 Merge pull request #36241 from hrumph/cert_problem 
Fixes #36240
 2016-10-12 17:28:35 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
rallytime
32846794c8 Update mocks for failing tests in win_certutil_test 2016-10-12 11:31:58 -06:00
Justin Findlay
4d8fb03b79 return opennebula errors to user (#36930) 
* cloud.clouds.opennebula: return errors to user

* cloud.clouds.opennebula._get_xml: add unit test
 2016-10-12 10:19:11 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
rallytime
b196c9336a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-11 13:54:09 -06:00
Thomas S Hatch
7e2eba9cc7 Merge pull request #36776 from cro/prox_min_mgr 
Adapt MinionManager for Proxy Minions.
 2016-10-11 11:12:01 -06:00
rallytime
c09b9d6e6a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-10 10:21:04 -06:00
Erik Johnson
7c78d6f419 Add unit tests for systemd scope usage 2016-10-07 17:35:09 -05:00
rallytime
2e34277b65 Add '--no-psqlrc' option to new-to-carbon postgres unit test 2016-10-07 16:10:57 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
C. R. Oldham
b7f9eb7864 Fix test. 2016-10-06 14:20:29 -06:00
Mike Place
1284de27fc Merge pull request #36789 from maximeguillet/fix-psqlrc-pg9.6 
Fix behavior of psql -c option with postgresql 9.6
 2016-10-06 20:24:51 +09:00
Maxime Guillet
b59c23bef1 Fix one remaining postgresql tests linked to #36787. 2016-10-05 17:05:10 +02:00
Maxime Guillet
8b92ae2061 Fix postgresql tests using position in the argument list of psql. 
Some tests use position number in the argument list of psql command
to check their results. As #36787 add one element, next position
in the list must be used.
 2016-10-05 16:08:42 +02:00
Maxime Guillet
21f2a17a07 Fix postgresql tests by adding --no-psqlrc option introduced by #36787. 2016-10-05 14:43:02 +02:00
Erik Johnson
d916c2b49c Handle cases where retcode/output feature is backported 
This will handle the case of RHEL 7.3, which maintains an older version
of systemd with the retcode/output changes from "systemctl status" in
systemd 231 backported.
 2016-10-04 09:55:56 -05:00
Erik Johnson
b3364646ad Update systemd module unit tests 
The _systemctl_status() function has changed its return data, this
commit updates the affected tests to reflect this.
 2016-10-03 22:51:43 -05:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-30 16:13:08 -06:00
rallytime
7a03c4df8c Fix merge conflict resolution error 
The original conflict resolution adjusted the wrong line. This puts
the test changes on the correct line and restores the original line.
 2016-09-29 11:26:50 -06:00
rallytime
6bc3221f7b Update test to not use the nested context (for Py3 compat) 2016-09-29 11:25:46 -06:00
rallytime
112903ad7e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/modules/archive.py
  - salt/modules/cmdmod.py
  - tests/unit/states/service_test.py
 2016-09-29 09:56:43 -06:00
Denys Havrysh
bba9d0d105 alternatives.install state: detect alternatives command failed 2016-09-29 18:09:16 +03:00