valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,848 Commits 24 Branches 182 Tags 341 MiB
1a4833b3a1
Commit Graph

7313 Commits

Author SHA1 Message Date
Thomas S Hatch
1a4833b3a1 Merge pull request #37279 from gtmanfred/2016.3 
initialize super class of NamespacedDictWrapper
 2016-11-01 09:12:49 -06:00
Mike Place
a6b7417fe9
SIGILL -> SIGKILL in process test 
Fairly sure this was a typo. cc: @s0undt3ch
 2016-10-31 20:54:42 +13:00
Daniel Wallace
597f346d57 initialize super class of NamespacedDictWrapper 
Fixes #37264
 2016-10-27 14:28:01 -05:00
Mike Place
760ed9f56d Merge pull request #37239 from Ch3LL/fix_cloud_timeout 
Fix cloud tests timeout
 2016-10-26 10:11:52 +09:00
Ch3LL
394fccf556 fix run_cloud timeout 2016-10-25 13:30:41 -06:00
Ch3LL
23947c5944 change timeout for cloud tests 2016-10-25 13:27:57 -06:00
Eric Radman
3829b7592f Update configuration examples for Joyent 
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
 2016-10-25 10:43:32 -06:00
Mike Place
0bbf06bd86
Lint fix 2016-10-25 16:53:18 +09:00
Mike Place
f609917760
Workaround for utils 2016-10-25 16:51:30 +09: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
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
Nicole Thomas
d7e28d24a4 Pylint fix for 2016.3 (#37186) 
Refs #37175
 2016-10-24 09:42:41 -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
Nicole Thomas
2bc5dedd06 Allow the minion test daemons a couple of tries to connect to the master (#37150) 
When running the tests with the tcp transport, we are not as forgiving
with the minion connection process as we are in ZMQ. In ZMQ, we attempt
to connect to the master. If it isn't up yet, we wait and try again. In
TCP, we try to connect to the master once, realize it's not up (because
the master process takes longer to spin up than the minions) and crash
and bail out.

This just gives the master a little more time to come up by having the
minions try to connect a couple more times.
 2016-10-21 14:50:39 -06:00
Mike Place
169a82e62b Merge pull request #37119 from jfindlay/log_proc_user 
log.setup: only assign user if defined
 2016-10-21 14:14:55 +09:00
Megan Wilhite
f22c686b34 fix digital ocean image name in profile (#37126) 
* fix digital ocean image name in profile

* remove skip and fix test
 2016-10-20 16:08:50 -06:00
Justin Findlay
1d503f032c tests.integration: pass opts as a dict 2016-10-20 14:16:35 -06:00
Nicole Thomas
8c46d69251 Merge pull request #37109 from meaksh/zypper-distupgrade-support-2015.8 
Some improvements for Zypper `dist-upgrade`
 2016-10-20 13:41:08 -06:00
twangboy
f1c8d98119 Skip weird_install test on Mac OS X 2016-10-20 11:05:34 -06:00
twangboy
90de794290 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-10-20 11:05:28 -06: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
0b87e7890a Merge pull request #37103 from cachedout/fix_proc_test 
Remove unnecessary sleep from unit.utils.process_test.TestProcessMana…
 2016-10-20 17:45:07 +09:00
Mike Place
3a37a22366 Merge pull request #37088 from meaksh/zypper-distupgrade-support-2015.8 
Adding 'dist-upgrade' support to the zypper module
 2016-10-20 14:46:56 +09:00
Mike Place
d7aebd1877
Remove unnecessary sleep from unit.utils.process_test.TestProcessManager.test_restarting 2016-10-20 14:29:10 +09:00
rallytime
b445a5e579 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/cp.py
 2016-10-19 18:24:04 -06: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
Denys Havrysh
d1ab98b459 cp.get_url: update usage doc and add tests for file:// URL with dest=None 2016-10-18 13:39:55 +03:00
twangboy
b3b688e298 Fix tests 2016-10-17 13:31:55 -06:00
Denys Havrysh
c7cf79e959 cp.get_url: add note and test for https:// URL with `dest=None` 2016-10-17 17:39:52 +03:00
Denys Havrysh
ff55f77179 cp.get_url: write more verbose docstring 2016-10-17 16:01:02 +03:00
Denys Havrysh
94a34a08ba cp.get_url: add integration tests 2016-10-17 15:46:49 +03:00
C. R. Oldham
c7595b84a7 Merge pull request #36981 from rallytime/upgrades-test-fix 
Skip pkg.upgrades test on distros other that Suse in 2016.3
 2016-10-13 15:29:36 -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
a5ae737057 Skip pkg.upgrades test on distros other that Suse in 2016.3 
Refs #36450 and #36980
 2016-10-13 12:02:22 -06:00
Nicole Thomas
3ac9ced202 Merge pull request #36241 from hrumph/cert_problem 
Fixes #36240
 2016-10-12 17:28:35 -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
rallytime
32829b9474 [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades 
yumpkg.list_upgrades returns an empty dictionary when no upgrades are available.
We need to check for this situation and skip the test if no upgrades are present.

Fixes the test failure on Fedora 24 on Jenkins currently, but also protects against
any potential failures for other RHEL-based distros that aren't currently failing
because "ret" is populated with a dictionary of upgrades.
 2016-10-11 16:50:50 -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
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