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,544 Commits 24 Branches 182 Tags 341 MiB
6cb7ce2c0f
Commit Graph

8467 Commits

Author SHA1 Message Date
Mike Place
6cb7ce2c0f
Fix typo in pkg upgrade test 2016-10-28 20:23:26 +09:00
rallytime
e4dc059959 Update Carbon versionadded tags to 2016.11.0 in tests/* 2016-10-27 10:04:13 -06:00
Mike Place
9f5cdf1d49 Merge pull request #37193 from cro/allow_host_from_scratch 
Allow VMs created from scratch to be assigned to a specific host
 2016-10-27 15:33:10 +09:00
Mike Place
afd3dc3807
Merge branch '2016.3' into 2016_3_carbon 2016-10-26 14:08:03 +09: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
C. R. Oldham
6a7eab9e16 Remove this test, it is no longer illegal to leave out image 
and clonefrom parameters.  It is possible to create a VM from scratch.
 2016-10-25 15:23:32 -06: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
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
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
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
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
f4ce268d51
Don't run ssh tests if we can't reach external server 2016-10-21 19:47:05 +09: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
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
Mike Place
3179303a5d Revert "Back-port #36875 to carbon" 2016-10-20 19:49:45 +09: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