Pedro Algarvio
fe0d7dc048
Adapted unit.modules.alternatives_test
to use salttesting.mock
2013-08-26 12:59:12 +00:00
Pedro Algarvio
371f08a959
Adapted unit.modules.virtualenv
to use salttesting.mock
2013-08-26 12:58:04 +00:00
Pedro Algarvio
c78738b87a
Adapt test results to the expected output.
2013-08-22 19:02:32 +01:00
Pedro Algarvio
bd002f97da
Revert "By enforcing absolute imports, there's no need for module name aliases."
...
This reverts commit a1a2b49a72
.
2013-08-20 23:44:05 +01:00
Pedro Algarvio
9353dcafd3
Revert "salt.modules.cmdmod
renamed to salt.modules.cmd
while enforcing absolute imports."
...
This reverts commit 3fa341280b
.
2013-08-20 23:44:03 +01:00
Pedro Algarvio
3fa341280b
salt.modules.cmdmod
renamed to salt.modules.cmd
while enforcing absolute imports.
2013-08-19 13:45:56 +01:00
Pedro Algarvio
a1a2b49a72
By enforcing absolute imports, there's no need for module name aliases.
2013-08-19 13:23:46 +01:00
Pedro Algarvio
7b3ba67bc7
Fix the test_install_pre_argument_in_resulting_command
test case.
...
It now checks if the `--pre` output is present in versions >= 1.4 or not in versions < 1.4
2013-08-09 12:14:56 +01:00
Joseph Hall
d539e6e8ff
Merge pull request #6433 from s0undt3ch/sprint/mock-salt.modules.archive
...
Complete the work started on the sprint for `salt.modules.archive`
2013-07-30 07:21:24 -07:00
Pedro Algarvio
fe1736bbcd
Fix the mocked test for archive.unrar
.
2013-07-30 06:14:13 +01:00
Pedro Algarvio
189bc4e45e
Added mocked tests for salt.modules.archive.unrar()
2013-07-30 05:36:19 +01:00
Pedro Algarvio
16c4057c4f
Added mocked tests for salt.modules.archive.zip()
. Excludes as a list
2013-07-30 05:01:39 +01:00
Pedro Algarvio
39d0006931
Added mocked tests for salt.modules.archive.unzip()
. Excludes as a list
2013-07-30 05:00:58 +01:00
Pedro Algarvio
34b22afad9
Added mocked tests for salt.modules.archive.rar()
2013-07-30 04:59:28 +01:00
Pedro Algarvio
1a7b68b1a3
Added mocked tests for salt.modules.archive.unzip()
2013-07-30 04:52:31 +01:00
Pedro Algarvio
2f2047aa47
Added mocked tests for salt.modules.archive.zip()
2013-07-30 04:22:02 +01:00
Pedro Algarvio
a7c7cca94e
Test if an exception is raised if the required binary is not found.
2013-07-29 23:29:58 +01:00
Thomas S Hatch
b2e41aceeb
Merge pull request #6402 from s0undt3ch/sprint/mock-salt.modules.archive
...
Updates and fixes to `salt.modules.archive` and `salt.utils.decorators.which`
2013-07-29 09:29:13 -07:00
Pedro Algarvio
14980b7497
Update the archive.tar
mocked test to the new usage.
2013-07-29 06:57:27 +01:00
Pedro Algarvio
4855c9427c
Simplify our decorator code and make it reusable.
2013-07-28 22:55:27 +01:00
Joseph Hall
d64dfdc70a
Merge pull request #6395 from s0undt3ch/sprint/mock-salt.modules.alternatives
...
Also test for `retcode > 0`.
2013-07-28 05:18:29 -07:00
Pedro Algarvio
5d0af6268e
Mocked test for salt.modules.archive.gunzip()
2013-07-28 12:51:13 +01:00
Pedro Algarvio
99b8f2f70f
Mocked test for salt.modules.archive.gzip()
2013-07-28 12:50:05 +01:00
Pedro Algarvio
3d17053e3f
Also test for retcode > 0
.
2013-07-28 12:41:15 +01:00
Pedro Algarvio
dcdb9bf686
Mocked test for salt.modules.archive.tar()
2013-07-27 19:24:49 +01:00
Thomas S Hatch
bca8014b00
Merge pull request #6347 from s0undt3ch/sprint/mock-salt.modules.alternatives
...
Mocked tests for `salt.modules.alternatives`
2013-07-27 10:14:17 -07:00
Pedro Algarvio
aabf18d76a
Remove un-neded import.
2013-07-27 18:11:55 +01:00
Pedro Algarvio
43b513e78f
Mocked test for salt.modules.alternatives.remove()
2013-07-27 18:07:18 +01:00
Pedro Algarvio
fa811882cc
Mocked test for salt.modules.alternatives.install()
2013-07-27 18:04:04 +01:00
Pedro Algarvio
6f10a44279
Mocked test for salt.modules.alternatives.check_installed()
2013-07-27 17:59:16 +01:00
Pedro Algarvio
068f0d6948
Mocked test for salt.modules.alternatives.show_current()
2013-07-27 17:56:05 +01:00
Pedro Algarvio
4b2ef2c3c8
Mocked test for salt.modules.alternatives.display()
2013-07-27 17:26:54 +01:00
Pedro Algarvio
07e7366728
user
and runas
now raise an exception. "There can be only one".
...
* Always show the deprecation message `runas` is not `None`.
* If both `user` and `runas` are used, that's an error! Full Stop!
* If `runas` is being used and `user` is not, adapt the code and don't fail.
2013-07-27 13:34:58 +01:00
Pedro Algarvio
5ee8073979
Test the deprecated runas
argument to salt.modules.pip
.
2013-07-27 13:06:36 +01:00
Pedro Algarvio
a33f9d771b
Alaways show triggered deprecation warnings on the unit test.
2013-07-27 13:04:59 +01:00
Pedro Algarvio
98c63b9671
Test if --pre
option argument ends up in the resulting command line for pip.install
.
2013-07-24 08:03:50 +01:00
Pedro Algarvio
d6b1e60fb1
Added a mocked test case for pip.list
with prefix matching.
2013-07-14 20:53:36 +01:00
Pedro Algarvio
01f489c79d
Added a mocked test case for pip.list
.
2013-07-14 19:30:08 +01:00
Pedro Algarvio
c83e767e06
Added a mocked test case for pip freeze
.
2013-07-14 19:25:44 +01:00
Pedro Algarvio
e17599a820
Added a mocked test case for --timeout
passing to pip uninstall
.
2013-07-14 19:02:41 +01:00
Pedro Algarvio
71c278384b
Added a mocked test case for --log
passing to pip uninstall
.
2013-07-14 19:01:27 +01:00
Pedro Algarvio
3e97e36e78
Added a mocked test case for --proxy
passing to pip uninstall
.
2013-07-14 18:59:23 +01:00
Pedro Algarvio
95ee5a9f36
Added a mocked test case for --proxy
passing to pip install
.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
315c1f911d
Added a mocked test case for multiple --requirements
passing to pip uninstall
.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
5435dc69e1
Added a mocked test case for multiple --requirements
passing to pip install
.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
411c926146
Prefix tests with install
since they're testing the install command.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
02034c4d86
Added a mocked test case for --no-install
passing to pip install
.
2013-07-14 18:59:18 +01:00
Pedro Algarvio
716f760e80
Added a mocked test case for --no-deps
passing to pip install
.
2013-07-14 18:59:13 +01:00
Pedro Algarvio
89fa6cecf4
Added a mocked test case for --ignore-installed
passing to pip install
.
2013-07-14 18:59:08 +01:00
Pedro Algarvio
892646bdee
Added a mocked test case for --force-reinstall
passing to pip install
.
2013-07-14 18:59:01 +01:00
Pedro Algarvio
03c88dac2c
Added a mocked test case for --upgrade
passing to pip install
.
2013-07-14 18:58:56 +01:00
Pedro Algarvio
27959701dc
Added support and a mocked test case for --global-options
passing to pip install
.
2013-07-14 18:58:49 +01:00
Pedro Algarvio
fd200c96b0
Added a mocked test case for --install-options
passing to pip install
.
...
* Replaced all occurrences of `basestring` with the `string_types` from salt's `_compat` module.
* Properly split install options on commas.
* Install options need to be quoted.
2013-07-14 18:58:44 +01:00
Pedro Algarvio
12d05e4b9a
Added a mocked test case for --exists-action
passing to pip install
.
...
* `exists_action` now only accepts it's valid settings, one of `s`, `i`, `w`, `b`, else, `CommandExecutionError`.
2013-07-14 18:58:37 +01:00
Pedro Algarvio
fb16313804
Added a mocked test case for --source
passing to pip install
.
2013-07-14 18:58:33 +01:00
Pedro Algarvio
85b0d7964d
Added a mocked test case for --no-download
passing to pip install
.
2013-07-14 18:58:28 +01:00
Pedro Algarvio
60ef910bad
Added a mocked test case for --download-cache
passing to pip install
.
2013-07-14 18:58:24 +01:00
Pedro Algarvio
bfcd91d700
Added a mocked test case for --download
passing to pip install
.
2013-07-14 18:58:12 +01:00
Pedro Algarvio
6fbbd5fb31
Added a mocked test case for --target
passing to pip install
.
2013-07-14 18:58:06 +01:00
Pedro Algarvio
aa8dda75c7
Added a mocked test case for --build
passing to pip install
.
2013-07-14 18:57:58 +01:00
Pedro Algarvio
6e0e8fddf9
Added a mocked test case for --no-index
passing to pip install
.
2013-07-14 18:57:52 +01:00
Pedro Algarvio
467d7de4e5
Added a mocked test case for --extra-index-url
passing to pip install
.
2013-07-14 18:57:47 +01:00
Pedro Algarvio
900682ac51
Added a mocked test case for --index-url
passing to pip install
.
2013-07-14 18:57:43 +01:00
Pedro Algarvio
d3c1c43781
Add tests for proper protocols to find_links
.
2013-07-14 18:57:42 +01:00
Pedro Algarvio
72600f67e6
Test string argument on pkgs
, editable
, find_links
and mirrors
.
2013-07-14 18:57:42 +01:00
Pedro Algarvio
3372034c07
Added a mocked test case for --timeout
passing to pip install
.
2013-07-14 18:57:37 +01:00
Pedro Algarvio
c582d721d9
Added a mocked test case for --log
passing to pip install
.
2013-07-14 18:57:29 +01:00
Pedro Algarvio
21698d187d
Update mocked test case to have the package name as last argument to the pip install
call.
2013-07-14 18:57:20 +01:00
Pedro Algarvio
5e58d4c4f3
Added mock test case for clear
, upgrade
and symlinks
for the virtualenv_mod
.
2013-07-14 13:23:18 +01:00
Pedro Algarvio
45c258e00b
Added test case for the prompt argument to virtualenv_mod
.
2013-07-14 13:04:11 +01:00
Pedro Algarvio
d8536c9f87
Add a mocked test case for salt.modules.virtualenv_mod
python argument.
...
* Updated the `virtualenv_mod` mock test case to patch `salt.utils.which` and `sys.modules` at class level as opposed to every function.
2013-07-14 12:53:23 +01:00
Pedro Algarvio
c65b1348fe
Fix Travis-CI for unit.modules.virtualenv_test.VirtualenvTestCase.test_no_site_packages_deprecation
...
Also mock the `virtualenv` module.
2013-07-13 23:23:30 +01:00
Pedro Algarvio
b6471e4099
Mock the virtualenv module in unit.modules.virtualenv_test.VirtualenvTestCase.test_issue_6031_multiple_extra_search_dirs
. Is Travis-CI still going to complain?
2013-07-13 23:14:12 +01:00
Pedro Algarvio
2b1cf0ac14
Patch _install_script()
since the virtualenv module will try to install some scripts.
2013-07-13 19:55:51 +01:00
Pedro Algarvio
05f2a23733
Make use of salttesting.helpers.ForceImportErrorOn
.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
04133b07b4
Added mock test case to test getting the virtualenv version from shell and not from the module.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
606c6d5ffb
Add test case which tests if non proper arguments raise an exception.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
de572cb193
Fix the virtualenv
unittests which rely on it's version changing.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
606413c063
Show a deprecation warning if no_site_packages
is used. Fixes #6027 .
...
If both `no_site_packages` and `system_site_packages` are used, throw an error.
Added the appropriate tests.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
cde1c628ac
Added a test case to check for multiple extra search dirs support. Refs #6031 .
2013-07-13 19:55:49 +01:00
Pedro Algarvio
2fd8dc299a
Add test case to check for proper handling of --never-download
. Refs #6030 .
...
Also added assertions to check for proper deprecation logging messages output.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
6126aa47be
Small code and print's cleanup.
2013-07-13 19:55:48 +01:00
Pedro Algarvio
8858d1183f
Add test case which tests for proper deprecated output based on virtualenv version.
2013-07-13 19:55:48 +01:00
Pedro Algarvio
64c9463a8b
Merge pull request #6143 from s0undt3ch/issues/6129-unexpected-__env__-keyword
...
Fix Issue #6129 unexpected `__env__` keyword
2013-07-13 11:53:19 -07:00
Pedro Algarvio
5bee1ca7f3
Re-implement 06ac67c84a
the right way since the state __env__
was being confused by the shell environment. Fixes #6129 .
2013-07-13 18:45:30 +01:00
Pedro Algarvio
269175145f
Update mocked rvm unit test since we now call cmd.run_all
instead of cmd.retcode
.
2013-07-13 17:46:46 +01:00
Pedro Algarvio
66d51a036f
Switch assertRaisesWithMessage
with assertRaises
. The first was not working as supposed.
2013-07-05 01:21:00 +01:00
Pedro Algarvio
3c3933d25e
Test for the proper exception, remove stray character left behind.
2013-07-05 00:57:47 +01:00
Pedro Algarvio
edf66fd3fe
pip
allows multiple --find-links
to be passed. Added mocked tests too.
2013-07-05 00:54:11 +01:00
Pedro Algarvio
e6aa92901d
Add multiple editable's and pkgs+editable's test cases.
2013-07-04 17:24:24 +01:00
Pedro Algarvio
6158edee2d
Add a mocked unit testcase to test for multiple mirrors support. Refs #5940 .
2013-07-04 15:01:05 +01:00
Pedro Algarvio
f8216aa584
Fix unit tests to expect the new, single quotes and less wasted white-space, output.
2013-07-04 14:50:07 +01:00
Pedro Algarvio
0631e31cb1
Updated unit.modules.win_status_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
86564ba1ce
Updated unit.modules.rvm_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
7a5872b498
Updated unit.modules.postgres_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
9df34a39d7
Updated unit.modules.pip_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
99d828a650
Updated unit.modules.gem_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
cb0922faf7
Updated some of the test cases to use a much more readable approach using salttesting.helpers.ensure_in_syspath()
.
2013-06-28 00:12:59 +01:00
Pedro Algarvio
6dfe563ce1
Added support for __main__
execution.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
d245b17412
Added support for __main__
execution and formatting fixes.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
222be7b446
Make sure every test module is runnable by __main__
.
...
* Double to single quotes
2013-06-28 00:12:56 +01:00
Thomas S Hatch
90c5cc8c4d
list_, not _list
2013-05-28 23:54:38 -06:00
Thomas S Hatch
95780ff219
Fix ref no non func alias in rvm test
2013-05-28 14:53:40 -06:00
Thomas S Hatch
8d018e0b8c
make gem test ref non func alias
2013-05-28 14:35:26 -06:00
Matt George
ecdff63b6e
added ability to activate a virtualenv before
...
running pip install
2013-05-17 13:56:09 -05:00
Thomas S Hatch
f1697aea5b
Fix test where the absence of mock breaks things
2013-05-07 22:42:08 -06:00
Daniel Watkins
7e7bf244c7
Move caching of requirements to helper function and add unit tests.
2013-05-07 10:20:56 +01:00
Chris Rebert
498d2999db
more typo fixes
2013-05-01 16:52:52 -07:00
Chris Rebert
26209c1fc1
rm unused imports reported by pyflakes
2013-04-30 14:48:04 -07:00
Pedro Algarvio
0d5c3b5f0c
Add cmd.run_all
to __salt__
. Required for the unit test.
2013-04-22 22:26:05 +01:00
Denis Generalov
1b1a5bd743
fix unit tests
2013-04-05 18:21:33 +04:00
G.Tjebbes
60af610e3f
Ref #4361 : add some unit tests on pip's args
2013-04-03 23:41:17 +02:00
Colton Myers
e277154c18
Fix patch.multiple (wrong order on function defs)
2013-03-21 17:26:12 -06:00
Colton Myers
99d0a34dc2
Define patch.multiple
2013-03-21 17:21:26 -06:00
Colton Myers
d42e9d8b63
Wrap extra Mock() references
2013-03-21 17:09:16 -06:00
Colton Myers
7d6c2ffcd3
Add skipIf decorator
2013-03-21 17:00:53 -06:00
Colton Myers
46f6145310
Remove trailing whitespace and fix PEP8 issues
2013-03-21 16:49:41 -06:00
Colton Myers
d3314e231b
Wrap mock import to avoid ImportErrors
2013-03-21 16:48:18 -06:00
Roberto Aguilar
f3b46d7460
Fixed tabs
2013-03-12 11:20:54 -07:00
Roberto Aguilar
18ba416554
Added default runas for postgres functions.
...
On BSD the default runas user is pgsql, on other systems it's postgres.
2013-03-12 18:10:46 +00:00
Pedro Algarvio
1795fbe591
Commented out test case which is failing since 209c566010
. @vlaci could you have a look please?
2013-02-17 12:05:11 +00:00
Roberto Aguilar
c0c67a7509
Added test for limit in file.sed.
2013-02-13 14:36:34 -08:00
Michał Jarco
77f898b0cb
Simplistic tests (still better than none)
2013-01-19 15:02:06 +01:00
Thomas S Hatch
ad63c17227
overcome value error in win status test
2013-01-13 00:09:28 -07:00
Pedro Algarvio
f8073a08eb
Warn about low mock version instead of mock not available.
2013-01-04 17:45:06 +00:00
László Vaskó
7ff2ab7d58
win_status_test: added pid explicitly
2012-12-31 11:45:54 +01:00
László Vaskó
d6d9e9ce47
win_status: finalize COM library properly
2012-12-31 11:45:54 +01:00
László Vaskó
51150f1427
win_status: handle if CommandLine is None
2012-12-31 11:45:54 +01:00
Thomas S Hatch
66ae9bcc67
Merge pull request #3080 from vlaci/master
...
'status.procs' function implementation and tests for windows
2012-12-30 20:03:07 -08:00
László Vaskó
ecef344c61
Added 'status.procs' function for windows
2012-12-31 01:34:38 +01:00
Ryan Schneider
8f8cc74b34
Some minor cleanup of unit and integration tests.
2012-12-18 17:39:16 -08:00
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