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,993 Commits 24 Branches 182 Tags 341 MiB
dfedd1185a
Commit Graph

3180 Commits

Author SHA1 Message Date
rallytime
d5a7ef6ca8 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-11-17 10:37:42 -07:00
Ch3LL
9ef41dcdfc change size and image of joyent profile 2016-11-16 11:54:21 -07:00
rallytime
1aa463b4c1 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-11-16 09:27:06 -07:00
Mike Place
f3496297a6 Don't check archive if the archive can't be found (#37723) 
Fixes possible false postive failure in archive test
 2016-11-16 09:23:39 -07:00
Ch3LL
363122c675 add timeout increase on azure tests 2016-11-15 10:27:44 -07:00
twangboy
a0429cf839 Use nfsd instead of apsd for test_disabled 2016-11-15 09:44:42 -07:00
twangboy
053198aa45 Fix tab 2016-11-15 09:33:01 -07:00
Jenkins
384cf67de5 Use nfsd instead of apsd to test disabled 2016-11-15 09:25:28 -07:00
Mike Place
9738b6359f Merge pull request #37671 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-15 20:01:09 +13:00
Ch3LL
acd4c3061e fix import for virtualbox test 2016-11-14 14:48:37 -07:00
rallytime
0e332ab591 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/cli/batch.py
  - salt/cli/salt.py
  - salt/transport/client.py
  - salt/utils/vmware.py
  - tests/integration/modules/sysmod.py
 2016-11-14 09:14:00 -07:00
Mike Place
305e51d1c0 Merge pull request #37625 from cachedout/issue_37492 
Return with proper retcodes in batch mode
 2016-11-12 20:29:09 +00:00
Mike Place
b14faf1c68 Merge pull request #37611 from jeanpralo/fix-cmd-batch-raw 
Fix cmd batch raw
 2016-11-11 15:53:58 +13:00
Mike Place
4fab707bdd Merge pull request #37627 from cachedout/pr-36706 
Exempt pip.iteritems from test_valid_docs test
 2016-11-11 15:48:37 +13:00
Mike Place
94df2f8e6f
Exempt pip.iteritems from test_valid_docs test 2016-11-11 15:47:43 +13:00
Jean Praloran
4f16840ef1 add integration test for salt.client.LocalClient.cmd_batch 2016-11-11 14:20:51 +13:00
Mike Place
b6031524e5
Return with proper retcodes in batch mode 
Check for the highest retcode received in batch mode and exit with it.

Also, an integration test for the same.

Closes #37492
 2016-11-11 14:03:29 +13:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -07:00
Erik Johnson
2810b85cac Add a test to ensure we don't check for fast-forward before fetching (#37571) 2016-11-09 12:43:25 -07:00
Nicole Thomas
2e8e56ca69 [PY3] Change log.warn statements to log.warning (#37531) 
* [PY3] Change log.warn statements to log.warning

log.warn is deprecated in Python 3. This change removes the
occurance of deprecation warnings for using log.warn. For example:

```
17:24:23 [WARNING ] /testing/salt/utils/verify.py:522: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead
17:24:23   log.warn('Insecure logging configuration detected! Sensitive data may be logged.')
17:24:23
17:24:23 [WARNING ] Insecure logging configuration detected! Sensitive data may be logged.
```

* Tweak unit.utils.verify_test to using warning instead of warn
 2016-11-08 13:06:54 -07:00
rallytime
9b3e4414c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/mac_power.py
  - salt/modules/win_dsc.py
  - salt/modules/win_servermanager.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/gitfs.py
 2016-11-04 15:23:49 -06:00
Mike Place
580eca709b Merge pull request #37121 from nevins-b/2016.3 
allow the file.recurse state to support saltenv
 2016-11-04 18:59:28 +13:00
Mike Place
534a21e8d6
Remove test 
I don't know why this would exist in a client test. This is tested extensively
already in the loader tests, which is the appropriate place.
 2016-10-31 20:39:34 +13:00
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
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
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
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
Nevins Bartolomeo
bc4b0e7cda adding test for saltenv in file.recurse source url 2016-10-21 08:44:58 -04: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
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
Mike Place
3179303a5d Revert "Back-port #36875 to carbon" 2016-10-20 19:49:45 +09:00
rallytime
b445a5e579 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/cp.py
 2016-10-19 18:24:04 -06: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
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
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
rallytime
21921af9a7 Skip pkg.upgrade test if pkg install/upgrade has problems 
Refs #36450
 2016-10-13 11:57:27 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
Andrew Pashkin
337119c113 Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running 2016-10-12 13:21:40 -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