Colton Myers
4ea3f8f80a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/pillar/neutron.py
salt/utils/http.py
2015-05-15 13:43:40 -06:00
Justin Findlay
b8867a8c23
update pip tests
2015-05-15 00:15:26 -06:00
Justin Findlay
11d893db19
explicitly quote requirements filename
2015-05-04 23:24:46 -06:00
Colton Myers
244c916b10
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/cron.py
salt/states/npm.py
2015-02-06 15:41:21 -07:00
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07:00
Justin Findlay
a44368001b
fix pip venv regression, deprecate activate param
...
Fixes #20191 . If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv. Also
update associated unit test.
2015-02-05 12:36:42 -07:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Pedro Algarvio
20e67986b3
Fix calls using user instead of runas. Make use of user.
2015-01-24 03:16:52 +00:00
Mike Place
d9c9eb1a6a
Yet even more test fixing. *sigh*
2015-01-24 03:16:50 +00:00
Mike Place
a8e6bd24e9
Fix failing pip tests
2015-01-24 03:16:49 +00:00
Colton Myers
3ce5eb2838
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/archive.py
salt/modules/brew.py
salt/modules/pip.py
tests/unit/modules/archive_test.py
tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
Thomas S Hatch
792b0ba9c6
added the shell call to too many tests
2015-01-08 10:13:50 -07:00
Thomas S Hatch
0e1683672f
first round of pip test updates
2015-01-07 14:54:36 -07:00
Mathieu Le Marec - Pasquet
2b4d7e3080
Support for vt in pip & venv modules
2014-10-23 20:18:44 +02:00
Khris Richardson
1acd82f3f1
add sphinx spelling extension. enforce en_us
2014-07-13 13:43:33 -05:00
Pedro Algarvio
7a5604fddd
Bump deprecations to Lithium
2014-04-24 10:15:31 +01:00
Pedro Algarvio
0ae1a15c61
PEP8 E302 and E303 blank lines fixes.
2013-11-27 12:11:45 +00:00
Pedro Algarvio
d02a2bc224
Include the python encoding file header on tests.
2013-11-27 11:19:24 +00:00
Pedro Algarvio
0f9ded1a7a
Fix the pip unit tests with regards to the latest saltenv
changes.
2013-11-06 23:53:45 +00:00
Pedro Algarvio
3c4f33a935
Adapt remaining test cases which relied on old versioning scheme.
2013-10-04 13:10:35 +01:00
Henrik Holmboe
da3799ba19
Add unit tests for a few functions in modules.virt
...
For:
* modules.virt._disk_profile()
* modules.virt._nic_profile()
* modules.virt._gen_xml()
2013-09-26 17:21:37 +02:00
Pedro Algarvio
70937172ce
Adapt mocked tests to the changes in #6833
2013-09-10 11:13:16 +01:00
Pedro Algarvio
6bc17f0c1b
Adapted unit.modules.pip_test
to use salttesting.mock
2013-08-26 13:00:10 +00:00
Pedro Algarvio
c78738b87a
Adapt test results to the expected output.
2013-08-22 19:02:32 +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
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
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