Commit Graph

59 Commits

Author SHA1 Message Date
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
2015-05-05 16:26:39 -06:00
Mike Place
e98e65e787 Fix tests 2015-05-05 08:20:41 -06:00
Colton Myers
d82d7645c9 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/modules/cmdmod.py
    salt/modules/debian_ip.py
    salt/modules/drac.py
    salt/modules/rpm.py
    salt/returners/postgres_local_cache.py
2015-03-19 16:13:16 -06:00
Colton Myers
e386db2c34 Update syndic_config test for new cachedir 2015-03-19 11:33:09 -06:00
Colton Myers
04b2125581 Update syndic_config test for new cachedir 2015-03-18 15:17:39 -06:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
sjwehry
342608d9bd Fixed spelling of "below" in 9 different files. 2015-01-06 19:55:28 -05:00
Chris Rebert
b9bb56841d fix numerous typos+misspellings 2014-11-05 13:57:47 -08:00
rallytime
4a740d876d Change ec2 profile name in config_test so test doesn't fail 2014-09-18 20:41:08 -06:00
rallytime
a28e0d88a3 Change ec2 profile name in config_test so test doesn't fail 2014-09-10 12:23:34 -06:00
Mike Place
c8f67c2b89 Fix tests and lint 2014-09-03 14:17:27 -06:00
rallytime
c70c8ee5aa Remove cloud_config tests for deprecated arguments 2014-07-17 16:41:11 -06:00
rallytime
dfb8894e6a Remove unused imports 2014-07-16 06:41:28 -06:00
rallytime
6733f45924 Removed deprecated references to check_dns 2014-07-16 06:26:08 -06:00
Thomas S Hatch
8435329d91 Merge pull request #14209 from cachedout/master_config
Small refactor
2014-07-14 16:06:09 -06:00
Mike Place
457a33d633 Fix test errors 2014-07-14 13:46:45 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
rallytime
67e65b237d More cloud config unit tests 2014-06-24 10:59:46 -06:00
rallytime
f821ccaa88 More cloud profile config tests 2014-06-23 15:19:11 -06:00
rallytime
d9f53a37f9 One more cloud config unit test 2014-06-23 12:17:26 -06:00
rallytime
d9c9297954 Make cloud configuration unit tests more organized 2014-06-20 15:47:00 -06:00
rallytime
1e83b2012b Unit tests for is_provider_configured function in salt.config.py 2014-06-20 15:29:18 -06:00
rallytime
3a84dd4a3c Unit tests for cloud_config function in salt.config.py 2014-06-19 16:03:59 -06:00
rallytime
e53ec01cd4 Transfer cloud_config_test.py tests to config_test.py 2014-06-19 09:20:38 -06:00
rallytime
636cf892ca Pylint fix 2014-06-18 17:47:05 -06:00
rallytime
c7e3816e54 Unit tests for cloud provider extends functionality 2014-06-18 17:15:15 -06:00
rallytime
914c9ed1fb First rudimentary cloud provider config tests 2014-06-17 15:12:23 -06:00
Pedro Algarvio
bebddb9174 Don't use hardcoded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
36ea569d0d Don't use hard coded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Thayne Harbaugh
871ba0010f BUG: The MOCK_HOSTNAME is not sufficiently long.
Extend the MOCK_HOSTNAME for a better chance that it will be longer
than the actual hostname.
2014-05-06 16:00:40 -06:00
Thayne Harbaugh
09eb54798b The MOCK_HOSTNAME is not sufficiently long to guarantee that it is
longer than the hostname on the current host.  Make it crazy long.
2014-05-06 15:28:55 -06:00
s8weber
d4b7951da8 fix minion id generation 2014-05-04 19:23:03 -04:00
Kevin Bowling
14c9d75a92 Replace socket.get_fqdn with internal salt.utils.network.get_fqhostname 2014-03-20 14:37:23 -07:00
Erik Johnson
6e50575049 Remove extraneous UTF8 coding line 2014-02-25 12:16:23 -06:00
Erik Johnson
f54ed36016 Add comment about importance of empty line 2014-02-25 11:55:10 -06:00
Erik Johnson
69ce44ed6f Add more get_id tests + some DRY fixes 2014-02-25 02:27:35 -06:00
Pedro Algarvio
ce9f923190 Test is now fixed. 2014-02-25 01:59:49 -06:00
Pedro Algarvio
284a2abfcb Get mock_open working.
Kind of since we're not using `mock_open` from the mocked library. Were
actually using the recipe to mock the builtin open as seen on http://goo.gl/dxMwPO
2014-02-25 01:59:30 -06:00
Erik Johnson
474e7590b9 Add test for salt.config.get_id() when /etc/hosts is parsed
This is a WIP, the mocking isn't quite working yet.
2014-02-24 23:46:00 -06:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Henrik Holmboe
77fd1acb7f Change assertEquals to assertEqual
According to
http://docs.python.org/2/library/unittest.html#deprecated-aliases
assertEquals is a deprecated alias of assertEqual.
2013-10-24 11:39:04 +02:00
Pedro Algarvio
9caffa11e7 Test for the presence of a yaml parsing log message. Fixes #6714.
Additionally, moved the yaml syntax error checking to the proper place.
2013-10-15 22:54:15 +01:00
Pedro Algarvio
3c4f33a935 Adapt remaining test cases which relied on old versioning scheme. 2013-10-04 13:10:35 +01:00
Pedro Algarvio
738902b322 Update current deprecation messages to use named versions. 2013-10-04 09:53:51 +01:00
Pedro Algarvio
e18ba0758b Don't include authorship in generated documentation, the Sphinx way. 2013-09-16 17:24:00 +01:00
Pedro Algarvio
2b64d0482d Make sure every temp dir created on the unittests respects, integration.SYS_TMP_DIR 2013-08-27 15:31:58 +00:00
Pedro Algarvio
40c5512bfb Properly deprecate check_dns.
Instead of having to leave `**kwargs` "forever" in `salt.config.minion_config` and `salt.config.apply_minion_config` in order to support API access to those which still passes `check_dns`. Support the argument but show a deprecation warning once. Leave the deprecation warning for 2 major releases. Then, finally, and properly, remove `check_dns` for good.
2013-07-20 01:39:23 +01:00
Pedro Algarvio
7aed6aeb30 Actually, the Syndic config test case can be a simple unit test. 2013-07-17 16:43:18 +01:00