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
96,073 Commits 24 Branches 182 Tags 341 MiB
f339608a88
Commit Graph

33 Commits

Author SHA1 Message Date
rallytime
e2616b605f
Update the pip tests to use the parsing syntax generated in PR #47196 2018-05-08 10:42:14 -04:00
rallytime
5565d5e9b1
Update old utils paths with new utils paths 2018-05-07 13:36:47 -04:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
 2018-05-07 13:17:01 -04:00
rallytime
a94cdf8a0d
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/daemons/flo/zero.py
  - salt/minion.py
  - salt/pillar/pillar_ldap.py
  - salt/transport/zeromq.py
  - salt/utils/async.py
  - salt/utils/zeromq.py
  - tests/integration/modules/test_service.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_pip.py
 2018-05-02 15:00:40 -04:00
Shane Lee
f031710af2
Merge branch '2017.7' into fix_47024 2018-05-01 16:26:04 -06:00
Daniel A. Wozniak
eb26321e8b
Fix missing import 2018-04-28 10:29:30 -07:00
Daniel A. Wozniak
a37a9da1fb
Fix py2 version of pip test 2018-04-28 02:24:39 -07:00
Erik Johnson
37a13d8004
Update pip unit tests to reflect changes 2018-04-27 09:47:18 -05:00
Erik Johnson
7f86779be0
Lint fix 2018-04-27 09:18:53 -05:00
twangboy
3e6e524eca
Fix some tests`` 2018-04-26 22:37:15 -06:00
Daniel A. Wozniak
dcb6a22c00
Remove un-needed string-escape 2018-04-26 11:28:25 -07:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/pip.py
  - salt/states/pip_state.py
  - salt/states/virtualenv_mod.py
  - tests/integration/modules/test_status.py
 2018-04-19 17:15:20 -04:00
Daniel Wallace
3dc93b310b
fix tests 2018-04-17 13:18:18 -05:00
rallytime
d83727fdf9
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/cli/api.py
  - salt/client/ssh/wrapper/state.py
  - salt/config/__init__.py
  - salt/crypt.py
  - salt/daemons/masterapi.py
  - salt/key.py
  - salt/loader.py
  - salt/master.py
  - salt/modules/archive.py
  - salt/modules/hipchat.py
  - salt/modules/pip.py
  - salt/modules/state.py
  - salt/modules/virt.py
  - salt/modules/x509.py
  - salt/state.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/__init__.py
  - salt/utils/event.py
  - salt/utils/extmods.py
  - salt/utils/files.py
  - salt/utils/parsers.py
  - salt/utils/verify.py
  - tests/integration/shell/test_call.py
  - tests/unit/utils/test_args.py
 2018-03-06 13:45:59 -05:00
Dheeraj Gupta
aa9d709015 Pass env_vars to pip.freeze 
pip.installed state calls pip.freeze to check for existing installation
and to verify installation post-install. This patch propagates the
env_vars passed to pip.installed to the pip.freeze function. It also modifies
existing pip unit tests to test new functionality and adds an integration test
that verifies the expected correct behavior

Fixes #46127
 2018-02-28 16:44:20 +05:30
twangboy
415821eee9
Fix encoding issue 2018-02-27 14:38:07 -07:00
Christian McHugh
249987f750 merge with develop 2017-11-27 22:04:59 +00:00
Nicole Thomas
9e45e4eff9
Lint: Remove extra blank lines 2017-11-27 11:25:05 -05:00
Christian McHugh
590834a136 Use json format with newer pip versions (> 9) 
Add unit tests for both pip > 9 and legacy
 2017-11-23 22:27:23 +00:00
Christian McHugh
ab5520fdf7 add true and false test for is_installed 2017-11-23 14:08:46 +00:00
rallytime
26410c662f Update some salt.utils.x paths for moved util functions 
Through merge forwards, some of the old-style paths have made their
way into develop. This PR corrects some of these instances on the more
popular functions.
 2017-08-29 16:24:47 -04:00
rallytime
1f0b90aa57 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/engines/slack.py
 2017-07-26 17:51:36 -06:00
twangboy
4ee24202fc Fix unit tests for test_pip 2017-07-05 15:49:53 -06:00
rallytime
f875ee3309 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - tests/integration/runners/test_runner_returns.py
 2017-04-28 09:26:26 -06:00
Pedro Algarvio
abe608d739
Drop @patch usage 2017-04-28 13:36:42 +01:00
Nevins Bartolomeo
b3a4d016c9 Mock cmd.run_stdout not cmd.run 2017-04-06 16:48:10 -04:00
rallytime
52edbffc85 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
 2017-03-28 17:09:30 -06:00
Pedro Algarvio
d397763553
Adjust to the new LoaderModuleMockMixin usage 2017-03-28 19:03:59 +01:00
Pedro Algarvio
9b1e55aa85
Import the full module namespace to avoid import shadowing. 
https://github.com/saltstack/salt/pull/39996#issuecomment-287857698
 2017-03-28 19:02:47 +01:00
Pedro Algarvio
1f7a0aa65b
Proper mocking 2017-03-28 19:00:51 +01:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt. 
Let's drop the salttesting dependency cycle.
 2017-02-28 22:52:49 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00:00