Commit Graph

2855 Commits

Author SHA1 Message Date
Anthony Shaw
3c6f13699b
unit tests for list_nodes and list_sizes with implementation 2017-04-29 15:24:15 +10: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
e6ee82e7be
The expected error message is different on py2 and py3 2017-04-28 13:36:45 +01:00
Pedro Algarvio
abe608d739
Drop @patch usage 2017-04-28 13:36:42 +01:00
Pedro Algarvio
4b59c351e4
This branch no longer targets py 2.6 2017-04-28 13:33:37 +01:00
Pedro Algarvio
9ffc79ca67
Use tornado HTTPClient directly. 2017-04-28 13:33:35 +01:00
Pedro Algarvio
7480a8e5fb
Check status on setUp not on the module level @skipIf decorator 2017-04-28 13:33:34 +01:00
Mike Place
78011f8740 Merge pull request #40761 from meaksh/develop-pkg-minor-fixes
Minor fixes on new pkg.list_downloaded
2017-04-28 06:32:48 -06:00
Pablo Suárez Hernández
9b241b7338 Adapting Zypper test to new list_downloaded output 2017-04-26 12:35:27 +01:00
Pablo Suarez Hernandez
ddf98e3fe3 Enhances pkg.list_downloaded information of a package 2017-04-26 12:34:13 +01:00
Anthony Shaw
5dee8b12de
add support for custom algorithms and complementary test 2017-04-25 21:47:38 +10:00
Anthony Shaw
867e6c1ce5
tests for load balancer and lint for other modules, fixes for load balancer 2017-04-25 21:07:27 +10:00
Anthony Shaw
5f03b7a506
tests for load balancer and fixed issue with destroy balancer 2017-04-25 20:44:36 +10:00
Anthony Shaw
bb4ec6c4db
tests for the storage module 2017-04-25 20:27:52 +10:00
Anthony Shaw
2b4d84ef3f
add a unit test to check the module starts correctly 2017-04-24 16:35:16 +10:00
Mike Place
6da806d1cc Merge pull request #39850 from epcim/pr_fix_keystone_endpoints_multiregion
Fix endpoint handling per region
2017-04-23 04:00:00 -06:00
rallytime
a7eb8f717e Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-21 09:50:25 -06:00
Petr Michalec
ab1dd446e7
Endpoint handling per region, fixes #35874
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
2017-04-21 15:48:52 +02:00
Andrey Arapov
4c29c5f6ab
dockerng: avoid network duplication and add driver_opts 2017-04-21 08:52:55 +02:00
rallytime
d5b1241972 Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
2017-04-20 17:02:33 -06:00
Pablo Suárez Hernández
bd1f170a05 Fixes Zypper unit test 2017-04-19 10:18:46 +01:00
rallytime
885419b3e7 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-17 13:27:58 -06:00
Mike Place
f7b062acd7 Merge pull request #40266 from meaksh/develop-pkg-improvements
[develop] Adding "pkg.downloaded" state and support for installing patches/erratas
2017-04-17 11:34:42 -06:00
Pablo Suárez Hernández
fa9e7f01f7 Pylint fix 2017-04-17 14:18:09 +01:00
Pablo Suárez Hernández
40422ecd02 Adding more unit tests for Zypper module 2017-04-17 13:06:35 +01:00
Pablo Suárez Hernández
5701e90803 Adding unit tests for Zypper execution module 2017-04-17 13:02:08 +01:00
rallytime
f552dd63f3 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - pkg/windows/installer/Salt-Minion-Setup.nsi
  - tests/unit/states/test_tomcat.py
2017-04-14 10:46:56 -06:00
Ch3LL
60724980ec
fix test_fstype test for mac 2017-04-13 12:04:20 -04:00
rallytime
749840ce5f Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-11 15:11:46 -06:00
rallytime
cd0adb82d6 Spelling fix 2017-04-11 13:35:38 -06:00
rallytime
36f7a6481b Remove blacklisted loader usage of dunder variables 2017-04-11 12:16:15 -06:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
2017-04-10 14:09:25 -06:00
Chris Heald
5139275602 Add env support for rvm.installed and rvm.do, opts support for .installed
Currently, the RVM state has no way to pass environment variables (ie, RUBY_CONFIGURE_OPTS)
or compilation flags (-C, --patch) to the Ruby installer. This patch enables this
functionality, permitting installation of customized Ruby installs. For example, the following
should now work:

   ruby-2.3.0:
     rvm.installed:
       - env:
           - RUBY_CONFIGURE_OPTS: --with-jemalloc
       - opts:
           - '--patch /path/to/my.patch'
           - '-C --enable-shared,--with-readline-dir=$HOME/.rvm/usr'
2017-04-10 12:40:56 -07:00
Nicole Thomas
93818257cb Merge pull request #40591 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-10 12:07:16 -06:00
rallytime
5a419b8aae Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/pillar.py
2017-04-07 11:23:41 -06:00
rallytime
4a75675d07 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
2017-04-07 11:20:51 -06:00
Erik Johnson
0c608d7417 Add client_args_mock back to test
I removed this incorrectly in resolving a merge conflict.
2017-04-07 08:50:45 -05:00
Nevins Bartolomeo
b3a4d016c9 Mock cmd.run_stdout not cmd.run 2017-04-06 16:48:10 -04:00
Erik Johnson
cb4db56eb5 Allow pillar.get to merge list as well as dictionaries
This also gets rid of the exception that used to be raised when the
default was not of the proper type, and instead skips merging in those
cases.
2017-04-06 12:24:22 -05:00
Erik Johnson
a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 2017-04-06 10:15:47 -05:00
Pedro Algarvio
843e218572
Remove unmocked patching 2017-04-05 23:17:36 +01:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-04-05 14:15:05 -06:00
Mike Place
8da27c9e1d Merge pull request #40306 from terminalmage/issue40279
Don't use context caching for gathering systemd services
2017-04-04 14:36:38 -06:00
Pedro Algarvio
de9ccbdb43
Fix mocked test 2017-04-04 18:58:21 +01:00
Pedro Algarvio
61003bca0a
Take care of resource leakage on tests 2017-04-04 18:58:20 +01:00
Pedro Algarvio
4a43d00d80
Proper mocking 2017-04-04 18:58:19 +01:00
Mike Place
6056ee302a Merge pull request #40339 from s0undt3ch/features/py3-pt2
[WIP] Move unit tests which were in integration tests - More py3 and mocking fixes
2017-04-04 10:21:46 -06:00
Eric Radman
3299f5b2ea Add mocks to allow keyboard tests to function on non-Linux systems 2017-04-03 22:11:38 -04:00
Mike Place
17808e7181 Merge pull request #40480 from terminalmage/docker-auth-handling
Improved Docker auth handling and other misc. Docker improvements
2017-04-03 16:44:48 -06:00
Mike Place
55fa3c12fa Merge pull request #39874 from kiorky/fixup_fail_rc
Make returncode friendly to onfail requisites
2017-04-03 15:28:50 -06:00