Eren Güven
2caf1d21d6
fix test
2015-10-08 14:57:33 +02:00
Oleg Gashev
2a88028595
Added skip test_ext_pillar_env_mapping if git module does not exist.
...
If module named git does not exist, test test_ext_pillar_env_mapping
fail:
======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
import git
ImportError: No module named git
Added skip test_ext_pillar_env_mapping test.
2015-10-05 14:47:25 -06:00
Mike Place
0bc37c0d41
Fix test
2015-09-28 12:57:22 -06:00
twangboy
7992b7e20a
Fixed some tests... hopefully...
2015-09-15 16:27:47 -06:00
Justin Findlay
440855b182
Merge pull request #27033 from jfindlay/n0ne
...
Merge #27019
2015-09-15 01:32:17 -06:00
Justin Findlay
3334b9d548
fix comment and unit test for reg state
2015-09-14 16:04:09 -06:00
Justin Findlay
391a09d5ac
update reg state unit tests
2015-09-10 16:16:15 -06:00
Justin Findlay
b36a7107b2
update win_path exec module unit tests
2015-09-10 15:17:46 -06:00
Justin Findlay
2c8beb238f
Merge pull request #27026 from rallytime/bp-27011
...
Back-port #27011 to 2015.5
2015-09-10 15:13:45 -06:00
Seth House
f8518d545f
Move giant eventlisten.sh example out of the state.event docstring
...
This is more interesting than directly useful and doesn't need to
clutter the docs.
2015-09-10 13:38:09 -06:00
Erik Johnson
30a4915762
Update tests to reflect changes to timezone module
2015-09-10 11:05:38 -05:00
Nicole Thomas
eddb532713
Merge pull request #26915 from rallytime/joyent-tests
...
Update Joyent Cloud Tests
2015-09-09 09:04:50 -06:00
Seth House
d68aefcfde
Remove mocks from rest_cherrypy integration tests
...
These mocks predated the inclusion of salt-api into Salt core. They are
now no longer needed and counter-productive.
2015-09-08 15:40:06 -06:00
Seth House
2aa3da8911
Rename the rest_cherrypy tests to conform to our convention
...
Previously they conformed to the default unittest2 convention.
2015-09-08 15:40:06 -06:00
rallytime
d4ad42d697
Update Joyent Cloud Tests
2015-09-04 12:23:05 -06:00
Joe Julian
6108ec4280
Gated dbus for os families that use it
...
Gated the dbus include for os families that are currently using it
within this module at this time.
Renamed some defs to more appropriately express their function.
2015-09-01 15:19:49 -07:00
Erik Johnson
b45f37a467
Add http basic auth tests
2015-08-28 15:43:24 -05:00
Erik Johnson
1ed42ea4fd
Remove git unit tests, moving them to salt.utils.url tests
2015-08-28 15:41:33 -05:00
Mike Place
cf487cf0f5
Merge pull request #26709 from rallytime/fix-14612
...
Ensure VM name is valid before trying to create Linode VM
2015-08-27 14:07:49 -06:00
Colton Myers
c3a6280f8c
Merge pull request #26617 from terminalmage/issue9592
...
Fix Windows failures in pip module due to raw string formatting
2015-08-27 13:24:53 -06:00
rallytime
a3ac8e7008
Whitespace fix
2015-08-27 11:41:14 -06:00
rallytime
9a4228d906
Added unit tests for new _validate_name function and adjusted regex
2015-08-27 11:17:28 -06:00
Colton Myers
64cad371f0
Remove overmocked test
2015-08-26 16:02:42 -06:00
Colton Myers
40718af1d5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
doc/conf.py
salt/modules/win_service.py
tests/integration/cloud/providers/digital_ocean.py
2015-08-26 14:29:57 -06:00
rallytime
c0d83d558d
Don't use id as variable
2015-08-25 11:03:30 -06:00
rallytime
2b4bc1679d
Keep ec2 instance creation test the same - it works better for the ec2 output
2015-08-25 11:01:02 -06:00
rallytime
b5b58eb31f
Skip digital ocean tests since we can't use API v1 with v2 tests
2015-08-25 10:44:28 -06:00
rallytime
9ae1539c62
Update cloud tests to be more efficient and accurate
2015-08-25 09:49:32 -06:00
Erik Johnson
ede057eebc
Fix tests to reflect args being passed as lists instead of strings
2015-08-24 23:54:09 -05:00
rallytime
9ae27193d8
Also add -Z to script args for cloud tests
2015-08-24 16:02:26 -06:00
Nicole Thomas
ed166ebd4f
Merge pull request #26618 from rallytime/pip-undate-cloud-tests
...
Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
2015-08-24 15:15:24 -06:00
rallytime
5a2c8825ba
Extra lines
2015-08-24 15:02:44 -06:00
rallytime
d28672b69e
Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
2015-08-24 15:01:30 -06:00
rallytime
1401255287
Use an available image to test against
2015-08-24 11:45:28 -06:00
Pedro Algarvio
965a4ba7cf
Merge pull request #26581 from terminalmage/fix-tests
...
Skip tests that don't work with older mock
2015-08-23 00:06:27 +01:00
Erik Johnson
49d8bd1dbe
Remove unused import
2015-08-21 22:54:54 -05:00
Erik Johnson
81a0d4c915
Skip tests that don't work with older mock
...
This fixes test failures on RHEL6 builds.
This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
2015-08-21 21:35:11 -05:00
Nicole Thomas
2cd36c7ed4
Merge pull request #26565 from cachedout/fix_virtual_warnings
...
Fix many errors with __virtual__ in tests
2015-08-21 15:37:53 -06:00
Jenkins
41541e4e2b
Fix many errors with __virtual__ in tests
...
Also stop using __salt__ in __virtual__ which is not guaranteed to exist
2015-08-21 14:01:03 -06:00
Colton Myers
28aa9b1058
Merge pull request #26486 from thusoy/git-confidential-auth
...
Git: Don't leak https user/pw to log
2015-08-20 10:04:52 -06:00
Tarjei Husøy
5289165487
Git: Don't leak https user/pw to log
2015-08-19 23:58:08 -07:00
Mike Place
a9b28e9577
Merge pull request #26483 from thusoy/git-user-only-auth
...
Handle user-only http auth in git module
2015-08-19 16:47:41 -06:00
Tarjei Husøy
09fc934acc
Handle user-only http auth in git module
2015-08-19 11:46:30 -07:00
Mike Place
8bb57d1631
Merge pull request #26342 from rallytime/fix-16049
...
Don't call boto_elb._attributes_present if no attributes were provided
2015-08-17 13:19:08 -06:00
Thomas S Hatch
0046c6cfed
Merge pull request #26300 from jfindlay/pw_test
...
mock pwd function calls in pw_user exec module
2015-08-17 12:56:41 -06:00
rallytime
211f6feaf5
Fix test failures - get_attributes shouldn't be called if none are provided
2015-08-17 10:58:44 -06:00
Justin Findlay
ee59d154d7
Merge pull request #26293 from jfindlay/reggie
...
Fix #26268
2015-08-13 13:48:06 -06:00
Justin Findlay
7e94989403
mock pwd calls in pw_user exec mod test
...
Fixes #26266 .
2015-08-13 13:20:11 -06:00
Justin Findlay
3348b726c9
fix state/reg unit tests
2015-08-13 12:13:02 -06:00
Mike Place
65ab5aa495
Merge pull request #26263 from rallytime/fix-24882
...
Don't make changes when test=True for openstack present/absent funcs
2015-08-13 10:30:31 -06:00
