valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,190 Commits 24 Branches 182 Tags 341 MiB
994d62431e
Commit Graph

5190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Larry Price
994d62431e found the issue, set cwd. 2012-06-30 11:43:32 -07:00
Larry Price
4edefcdfec Merge branch 'develop' of https://github.com/saltstack/salt into develop 2012-06-30 11:23:51 -07:00
Thomas S Hatch
0cc8e45a7e Merge pull request #1534 from whiteinge/doc-blurb 
Yet another attempt at a marketing blurb that doesn't annoy people
 2012-06-30 14:43:02 -07:00
Seth House
edcbb72741 Updated the marketing blurb with something less buzzword-heavy 2012-06-30 14:36:43 -07:00
Thomas S Hatch
8ba1d51a75 Merge pull request #1533 from mattrobenolt/django-module-tests 
Added tests for Django module
 2012-06-30 14:33:16 -07:00
Thomas S Hatch
ede600a734 Merge pull request #1532 from akoumjian/develop 
Fix for minion KeyError 1523
 2012-06-30 14:27:40 -07:00
Matt Robenolt
aea679801f Django commands should all internally call the generic "command" function 2012-06-30 14:25:25 -07:00
Alec Koumjian
40781ea0ae Fix for minion KeyError 1523 2012-06-30 14:25:14 -07:00
Matt Robenolt
d327e6bdf4 Adding tests for Django module commands 2012-06-30 14:24:22 -07:00
Thomas S Hatch
f0073bc5dd Merge pull request #1531 from dcolish/develop 
Skip verify_env test on windows.
 2012-06-30 14:13:02 -07:00
Dan Colish
1b1431ba66 Skip verify_env test on windows. 2012-06-30 14:11:37 -07:00
Thomas S Hatch
ed84eda01f Merge pull request #1530 from dcolish/develop 
Fix test.integration.states.host. Make master_config and minion_config a...
 2012-06-30 14:03:56 -07:00
Jeff Schroeder
9d2a749319 Merge pull request #1422 from kvelarde/develop 
First monit module commit
 2012-06-30 14:00:20 -07:00
Dan Colish
c5cdb366dc Fix test.integration.states.host. Make master_config and minion_config a property to keep semantics consistent 2012-06-30 13:54:23 -07:00
Jeff Schroeder
6950d296a6 Merge pull request #1529 from drd/develop 
Create skeletal HACKING file
 2012-06-30 13:36:20 -07:00
Eric O'Connell
53ea031a72 Create skeletal HACKING file 2012-06-30 13:31:38 -07:00
Thomas S Hatch
d15899ce20 Merge pull request #1528 from dcolish/develop 
Add unittests for salt.utils.verify
 2012-06-30 13:30:36 -07:00
Thomas S Hatch
98094e682c Merge pull request #1527 from laprice/develop 
initial version of states/user.py and adding states to default runtests.py
 2012-06-30 13:29:43 -07:00
Dan Colish
ef523b02f0 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-06-30 13:29:10 -07:00
Dan Colish
01b74fc04c Add unittests for salt.utils.verify 2012-06-30 13:28:15 -07:00
Thomas S Hatch
7e4c10d0c0 Merge pull request #1526 from UtahDave/fix_setup.py 
import setuptools if SETUPTOOLS  env var exists
 2012-06-30 13:09:41 -07:00
David Boucha
7d89ee3783 import setuptools if SETUPTOOLS env var exists 
Default to importing distutils unless the user
has created an environment variable named
SETUPTOOLS in which case import setuptools
 2012-06-30 14:01:57 -06:00
Thomas S Hatch
2fa09e0c03 Merge pull request #1524 from dcolish/develop 
Move tmp hosts file management to test case which requires it. Fix
 2012-06-30 12:47:01 -07:00
Dan Colish
edfb3d2560 Merge branch 'develop' of git://github.com/saltstack/salt into develop 
Conflicts:
	tests/unit/utils/find_test.py
 2012-06-30 12:46:04 -07:00
Thomas S Hatch
582d0e15fe Merge branch 'develop' of github.com:saltstack/salt into develop 2012-06-30 13:42:00 -06:00
Thomas S Hatch
27b5da0f82 initial addition of event system minion module 2012-06-30 13:41:14 -06:00
Thomas S Hatch
e285aa8d5c change msg to data for consistency 2012-06-30 13:40:43 -06:00
Jeff Schroeder
7e16fd680a Merge branch 'develop' of github.com:saltstack/salt into develop 2012-06-30 12:34:41 -07:00
Jeff Schroeder
07b4c8b4ed Skip the rvm and gem module/state tests when mock is missing 
The mock python module is required for the gem and rvm tests.
If it is not available, the tests should be gracefully skipped.

From python runtests.py -u:

test__check_and_install_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_rvm (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_gemset_present (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test_removed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test__rvm (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__rvm_do (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list_all (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_install (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__gem (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_sources_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
 2012-06-30 12:29:48 -07:00
Dan Colish
78d16a28f0 Move tmp hosts file management to test case which requires it. Fix 
test.unit.utils.find_test on OSX
 2012-06-30 12:20:53 -07:00
Thomas S Hatch
65d8cb4e59 Merge pull request #1521 from dcolish/develop 
Fix host file setup and fix tests.integration.states.host
 2012-06-30 12:00:05 -07:00
Thomas S Hatch
8748414b21 Merge pull request #1520 from mattrobenolt/fix-ssh-module-tests-vagrant 
Hardcode /tmp/subsalttest dir in ssh module integration tests
 2012-06-30 11:55:47 -07:00
Dan Colish
f79b6e5ea0 Fix host file setup and fix tests.integration.states.host 2012-06-30 11:47:48 -07:00
Matt Robenolt
57ff2bfe3e Hardcode /tmp/subsalttest dir in ssh module integration tests 
I don't really like doing this, but `/tmp/subsalttest dir` is already
hardcoded in other places for running tests.

Without this, when running tests under a mounted Vagrant drive,
`ssh-keygen` doesn't have permission to create the symlink for
known_hosts to known_hosts.old, causing a test to fail.

```
======================================================================
FAIL: test_rm_known_host (integration.modules.ssh.SSHModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/vagrant/tests/integration/modules/ssh.py", line 143, in
test_rm_known_host
    self.assertEqual(ret, 'add')
AssertionError: 'exists' != 'add'
```

`link /vagrant/tests/integration/tmp/known_hosts to
/vagrant/tests/integration/tmp/known_hosts.old: Operation not permitted`
 2012-06-30 11:46:31 -07:00
Thomas S Hatch
0911c130a7 Add master side event evaluation 2012-06-30 12:39:51 -06:00
Thomas S Hatch
7424738dc9 Merge pull request #1519 from intchanter/develop 
Remove 'DO NOT EDIT', as distros copy as-is.
 2012-06-30 11:19:05 -07:00
Intchanter
5f98f6cc83 Remove 'DO NOT EDIT', as distros copy as-is. 2012-06-30 12:14:58 -06:00
Jeff Schroeder
27bba6ad0c Merge pull request #1518 from laprice/develop 
Tenants rent your property. Tenets are are principles that you uphold.
 2012-06-30 10:48:38 -07:00
Thomas S Hatch
8f8597d91f Merge pull request #1517 from baijum/sprint 
Fix various issues with `is_replication_enabled`
 2012-06-30 10:12:21 -07:00
Baiju Muthukadan
fa6b8b989c Fix various issues with is_replication_enabled 
- `_is_master()` is global function
- `is_none()` was not defined (use is None)
- s/replication_enabled/enabled
 2012-07-01 03:54:59 +05:30
Larry Price
55a145e862 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2012-06-30 10:00:48 -07:00
Thomas S Hatch
e01a4c2d26 Merge pull request #1516 from baijum/sprint 
ignore 'tmp' directory created by integration test
 2012-06-30 09:49:50 -07:00
Baiju Muthukadan
4668e2c5d8 ignore 'tmp' directory created by integration test 2012-07-01 03:46:43 +05:30
Larry Price
aa95c9d26b initial test case for user. 2012-06-30 09:43:44 -07:00
Larry Price
c2f89a849d adding state tests to the full run :-/ 2012-06-30 09:40:00 -07:00
larry
919f1e5b29 Tenants rent your property. Tenets are are principles that you uphold. 2012-06-30 06:25:06 -07:00
Thomas S Hatch
0c66239842 Merge pull request #1513 from wilkystyle/develop 
Develop
 2012-06-29 09:53:33 -07:00
Mike Wilkerson
6805eae79a fixed globbing when no minions are found 2012-06-29 12:47:33 -04:00
Mike Wilkerson
a8d3ac3de1 Merge remote-tracking branch 'upstream/master' into develop 2012-06-29 12:15:13 -04:00
Thomas S Hatch
f922152bfc Spelling error in state module 2012-06-28 22:10:53 -06:00