valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,787 Commits 24 Branches 182 Tags 341 MiB
b37c76a800
Commit Graph

494 Commits

Author SHA1 Message Date
Pedro Algarvio
14cc8931ed Disable some Pylint errors 2014-11-28 15:30:05 +00:00
Pedro Algarvio
bfe99dbb3f Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	salt/runners/manage.py
 2014-11-26 20:14:56 +00:00
Pedro Algarvio
2a597da207 Switch open() for salt.utils.fopen() 2014-11-26 17:47:05 +00:00
Pedro Algarvio
6b72255e9b Switch open() for salt.utils.fopen() 2014-11-26 17:46:13 +00:00
Pedro Algarvio
a802d8f7f5 Use the skip_if_binaries_missing_helper 2014-11-20 16:40:38 +00:00
rallytime
e70537eb2c Fix missing cls variable and add some docstring info 2014-11-20 09:15:56 -07:00
Jonathan Ballet
a6c3499749 Please pylint 
My patch #18221 yesterday introduced new Pylint warnings/errors.

This fixes these warnings.
 2014-11-19 19:28:28 +01:00
Thomas S Hatch
873d1c1803 Merge pull request #18221 from multani/fix/git-config-set-shell-escape 
Fix Git's config set with values containing white spaces.
 2014-11-18 17:14:43 -07:00
Jonathan Ballet
97959959ca Add future's absolute import to fix importation of git in tests 
Tests in pillar.py are importing the "git" module, which is supposed to
be "GitPython", bt since Python 2.x doesn't use absolute import by
default, it imports the "git" submodule, which defines the tests for the
Git module of Salt, instead.
 2014-11-18 22:46:35 +01:00
Jonathan Ballet
38bb70d398 Fix Git's config set with values containing white spaces. 
The Salt function 'git.config_set' and the state 'git.config' (which relies
on the former) don't escape the value to be set in the configuration file
passed by Salt. For example, this doesn't work:

  mylocalrepo:
    git.config:
      - name: user.name
      - value: "Jonathan Ballet"
      - repo: file://my/path/to/repo

This set the 'user.name' configuration value to "Jonathan" only.
(Additionally, the state discovers that the value set is not the one
specified, and keeps trying to set the right value, which ends up with lot
of "name = Jonathan" into the "[user]" section of Git's config file.)

This commit fixes the problem and adds some unit tests to verify it's
working properly.
 2014-11-18 20:02:24 +01:00
rallytime
652d4b4803 Fix up the linux_acl test that is failing 2014-11-14 15:40:12 -07:00
Chris Rebert
478e406001 replace salt._compat.string_types with six.string_types 2014-11-11 13:45:52 -08:00
Roman Inflianskas
fb5e86aaa1 modules.linux_acl: satisfy pylint 2014-11-04 16:17:35 +03:00
Roman Inflianskas
83b760db44 modules.linux_acl: add integration tests 2014-11-04 14:45:23 +03:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
Thomas Jackson
6262d44d50 Add "normalize_ret" function, so we don't have to copy/paste so much 
Add checks for "changes" since we want to test cases where there aren't changes to be made
 2014-10-30 16:58:03 -07:00
Thomas Jackson
d2b548a0e7 Add regression test for #17051 2014-10-30 16:43:06 -07:00
Thomas Jackson
6612aa808e Revert spelling fix, since its a variable name :) 2014-10-29 13:56:44 -07:00
Thomas Jackson
aabe6460f6 Misc comment cleanup in tests 2014-10-28 08:12:10 -07:00
Thomas S Hatch
5ab6743b85 Merge branch '2014.7' into develop 2014-10-13 20:06:17 -06:00
Pedro Algarvio
e739561728 Use the salttesting skip helpers 2014-10-08 01:02:10 +01:00
Thomas S Hatch
0a094e2c43 Merge pull request #15104 from srkunze/feature/safe_env 
Made safe environment copy
 2014-09-08 14:48:58 -06:00
Sven R. Kunze
d294e95cf5 fixed test_os_environment_remains_intact 2014-09-05 12:20:08 +02:00
Antoine Jacoutot
1ef276575f tests: recognize OpenBSD 2014-09-04 10:23:59 +02:00
Thomas S Hatch
ab1c6bcf27 One more test fix 2014-09-03 08:43:52 -06:00
Thomas S Hatch
b95d575e52 Fix tests for new changes from PR #15217 2014-09-02 17:39:50 -06:00
rallytime
b8db5ff56b Change lxc skipIf message to be more helpful 2014-08-15 14:21:09 -06:00
rallytime
396a4de7c5 Make lxc tests run! 2014-08-15 11:09:20 -06:00
rallytime
7f170c126f Remove 'RC1' from GIT_VERSION comparison 2014-08-14 11:06:18 -06:00
rallytime
fe5b8d22ec Fix gitpillar skipIfs 2014-08-14 10:34:38 -06:00
rallytime
496cfe25b3 Add skipIfs to ext_pillar tests if GitPillar 0.3.2rc1 or > isn't installed 2014-08-13 14:14:53 -06:00
rallytime
7bb5ef3773 Skip lxc tests if no lxc and skip failing vt_test if running osx 2014-07-21 17:11:20 -06:00
Mike Place
919e9db946 Increase timeout for grains test 2014-07-17 13:27:08 -06:00
rallytime
486aa982ad Fix spelling error: doctring -> docstring 2014-07-15 09:26:55 -06:00
Mike Place
a08849c270 Remove old-style env= tests. 2014-07-14 11:03:03 -06:00
Thomas S Hatch
7e54d0fa20 Revert "lxc refactor" 2014-07-12 11:38:03 -06:00
Matthew Williams
71e1522c08 WIP: continue restructure of modules.lxc 2014-07-11 19:17:55 +00:00
Matthew Williams
3a0263d551 WIP: lxc restructure 2014-07-11 18:28:37 +00:00
Matthew Williams
e102a95b84 use a faster template (sshd) for lxc integration tests 2014-07-10 14:38:28 -04:00
Matthew Williams
298d4e6eac add lxc integration tests 2014-07-10 13:37:48 -04:00
Aditya Kulkarni
edfabad5e2 Skip tests if no internet connection 2014-07-08 17:16:47 -06:00
Aditya Kulkarni
a7b52855d3 Make sure multiple git pillar sources work 2014-07-08 10:58:31 -06:00
rallytime
d5c2a92d24 Fix typo in email from bad copy-paste 2014-07-07 16:12:11 -06:00
Mike Place
f9478a70f7 Fix all RAET publish tests 2014-07-01 15:13:52 -06:00
Pedro Algarvio
edffec0159 Fix imports 2014-06-15 13:05:19 +01:00
Pedro Algarvio
bd35008d34 No need for late imports. Use AdaptedConfigurationTestCaseMixIn. 2014-06-15 13:05:19 +01:00
Mike Place
616c3b5547 Fix failing test 2014-06-12 13:35:36 -06:00
Pedro Algarvio
5f2cc54160 Assert proper return types from state calls. 
Just to be sure.
 2014-06-11 01:12:13 +01:00
Pedro Algarvio
01a48b6b5b Fix PEP8 E714 - test for object identity should be "is not" 2014-06-06 11:37:16 +01:00
Pedro Algarvio
e03226c67b Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:27:26 +01:00