Intchanter
|
3c05a3ee78
|
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Conflicts:
tests/integration/modules/grains.py
tests/integration/states/host.py
tests/unit/utils/find_test.py
|
2012-07-04 18:29:13 -06:00 |
|
Intchanter
|
a1433ef5ec
|
PEP8 fixes for tests
|
2012-06-30 14:10:34 -06: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 |
|
Jeroen Dekkers
|
92ffbaba6e
|
Be compatible with mock 0.7
|
2012-06-19 02:19:03 +02:00 |
|
Anselm Helbig
|
d02f0beaee
|
added proper unit tests for gem and rvm modules and states; fixed bugs in the rvm module's install function and in the rvm state's handling of ruby versions
|
2012-05-03 11:33:16 +02:00 |
|
Anselm Helbig
|
5bc9ea7d67
|
added preliminary unit tests for rvm module
|
2012-05-02 09:42:01 +02:00 |
|