valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,989 Commits 24 Branches 182 Tags 341 MiB
45d663f435
Commit Graph

6223 Commits

Author SHA1 Message Date
GwiYeong
45d663f435
fix for local client timeout bug 2018-02-12 13:00:22 +09:00
Nicole Thomas
80a2d009b4
Merge pull request #45517 from kstreee/fix-mkdir 
Fixes base dir making logic to ensure not raising the exception when base directory already exists.
 2018-02-05 09:56:22 -05:00
kstreee
24d41f2451
Fixes base dir making logic to ensure not raising the exception when base directory already exists. 2018-02-02 09:55:08 +09:00
William Villeneuve
217791079b some code cleanup (lint errors and escape_argument as _cmd_quote) 2018-01-28 12:42:33 -05:00
William Villeneuve
1c29bc5a3d fixed quoting of script path in cmd.script 2018-01-26 09:05:18 -05:00
Benjamin Drung
76d44e9490 Fix skipping test when boto is not installed 
When boto and moto are not installed, the BotoVpcTestCaseBase() should
be skipped. _get_boto_version() and _get_moto_version() require that
boto and moto are installed, but are called anyway in the skipIf
condition.
 2018-01-23 13:32:22 +01:00
Benjamin Drung
2b9b262357 Fix unit.modules.test_cmdmod.CMDMODTestCase.test_run 
The test_run unit tests end result when a command is not found. When
_run() is called without setting cwd, it will use the home directory as
working directory. When the home directory does not exist, the unit test
will fail:

Traceback (most recent call last):
  File "tests/unit/modules/test_cmdmod.py", line 231, in test_run
    ret = cmdmod._run('foo', use_vt=True).get('stderr')
  File "salt/modules/cmdmod.py", line 536, in _run
    .format(cwd)
salt.exceptions.CommandExecutionError: Specified cwd
'/sbuild-nonexistent' either not absolute or does not exist

Therefore set cwd to the current directory since the working directory
is not used in this test case.

This fixes one failing test of #45627.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-01-23 13:18:18 +01:00
rallytime
a5fc3b3363
Merge branch '2017.7.3' into '2017.7' 
No conflicts.
 2018-01-22 11:55:54 -05:00
Daniel Wallace
bd3cb47fa7
fix mock for opensuse 
Opensuse needs a run_all in here, mock it so we don't see an error, and still
test the docker stuff
 2018-01-20 09:58:22 -07:00
Daniel Wallace
808e26e69a
test simple website 2018-01-20 09:57:20 -07:00
rallytime
e0ffa32b49
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/integration/modules/test_pkg.py
 2018-01-19 10:09:36 -05:00
Daniel Wallace
8d907ee1a0
fix moto version 
Fixes saltstack/salt-jenkins#692
 2018-01-18 14:56:31 -07:00
Daniel Wallace
1241ab5fc6
fix test boto imports 
Test boto imports are failing for some reason
 2018-01-18 14:56:27 -07:00
Daniel Wallace
6c26025664
fix mock for opensuse 
Opensuse needs a run_all in here, mock it so we don't see an error, and still
test the docker stuff
 2018-01-18 10:48:07 -07:00
Frode Gundersen
ccf062d62e
fix test_archive test for mac on 2017.7 branch 2018-01-17 18:54:35 +00:00
Daniel Wallace
b9761971c2
fix moto version 
Fixes saltstack/salt-jenkins#692
 2018-01-13 15:01:14 -05:00
Daniel Wallace
0cd95d1cc6
fix test boto imports 
Test boto imports are failing for some reason
 2018-01-13 15:01:14 -05:00
Erik Johnson
5473c085d9
Fix loader error in 2017.7 tests 2018-01-11 08:40:27 -06:00
Nicole Thomas
d0e5e70277
Merge pull request #45295 from gtmanfred/test_directory 
test directory that doesn't exist
 2018-01-08 15:59:52 -05:00
Nicole Thomas
eea7158e82
Merge pull request #45279 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2018-01-08 12:26:48 -05:00
Nicole Thomas
e6178fe6d4
Merge branch '2017.7' into test_directory 2018-01-05 17:08:58 -05:00
Daniel Wallace
24114e91c1
test was different slightly on 2017.7 2018-01-05 12:25:09 -07:00
Daniel Wallace
d20fc93625
test directory that doesn't exist 
sometimes /etc/grub.conf exists and is a symlink to /boot/grub/grub.conf, and
this won't do the right thing.
 2018-01-05 09:51:58 -07:00
rallytime
8025b14584
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/utils/test_parsers.py
 2018-01-04 17:37:48 -05:00
Steve Weber
942c14bb29
pillar body overrides includes 
vars in pillar body override pillar includes
 2018-01-04 17:33:39 -05:00
rallytime
68f971b38f
Apply test fixes from #45034 to parsers_test.py 2018-01-03 15:10:04 -05:00
Nicole Thomas
4f514a29a7
Merge branch '2017.7' into pkg-uptodate 2018-01-02 09:56:28 -05:00
Nicole Thomas
abed378981
Merge pull request #45204 from garethgreenaway/45176_fixes_to_osquery_module 
[2017.7] Fixes to osquery module & addition of unit tests
 2017-12-30 08:25:37 -05:00
Adam Mendlik
29ef67bac2
Test pkg.uptodate with failed upgrades 2017-12-29 07:18:50 -07:00
Adam Mendlik
7c67ec39d9
Add tests for pkg.uptodate state 2017-12-29 07:18:49 -07:00
Gareth J. Greenaway
d834bd1b6f
Fixing some minor lint issues. 2017-12-28 17:07:38 -08:00
Gareth J. Greenaway
4738205154
Fixing a bug when attributes are passed to various osquery module functions. 2017-12-28 17:07:38 -08:00
rallytime
430c913c8c
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/auth/pam.py
  - salt/master.py
  - tests/unit/test_target.py
 2017-12-28 12:15:54 -05:00
Gareth J. Greenaway
0ff811de70
Swapping import to be the old path for 2016.11 2017-12-21 08:17:53 -08:00
Gareth J. Greenaway
b3e2f388f5
Fix to allow nodegroups to include sequences 2017-12-20 16:56:16 -08:00
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-16 08:16:23 -05:00
twangboy
40665d7b08
Skip test_log_created on Windows 2017-12-13 14:12:07 -07:00
rallytime
a0d2dd2069
Lint fix 2017-12-13 14:06:11 -05:00
rallytime
9db4179462
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/grains/test_core.py
 2017-12-12 15:24:30 -05:00
Daniel Wallace
66bb755751
add test for effective acls 2017-12-12 09:58:08 -07:00
Nicole Thomas
85160fd297
Merge pull request #44921 from Ch3LL/log_test 
Add test to ensure log files are created
 2017-12-11 13:24:15 -05:00
Ch3LL
3bb58fb577
skip salt-key log creation test 2017-12-11 10:59:10 -05:00
Nicole Thomas
df28f312ac
Merge pull request #44879 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-10 11:53:43 -05:00
Nicole Thomas
f5a143f8c5
Merge pull request #44621 from isbm/isbm-bsc1068446-2017.7 
Bugfix: errors in external pillar causes crash, instead of report of them
 2017-12-08 13:46:55 -05:00
rallytime
23c5a4ca3e
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/file.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2017-12-07 17:33:03 -05:00
Ch3LL
6a379195bc
Add test to ensure log files are created 2017-12-07 17:31:26 -05:00
Nicole Thomas
abe089ad54
Merge pull request #43379 from twangboy/win_fix_file.managed 
Fix file.managed on Windows with test=True
 2017-12-07 16:10:42 -05:00
Gareth J. Greenaway
edcd581ca5
Merge branch '2017.7' into win_fix_file.managed 2017-12-07 10:00:55 -08:00
Daniel Wallace
3f1268d67f
fix patching for python 2.6 2017-12-07 08:25:26 -07:00
Nicole Thomas
7adcfbf8ec
Merge branch '2017.7' into develop2 2017-12-07 10:14:52 -05:00