valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
98,210 Commits 24 Branches 182 Tags 341 MiB
63f7616415
Commit Graph

8948 Commits

Author SHA1 Message Date
Nicole Thomas
63f7616415
Merge pull request #49951 from twangboy/fix_test_kubernetes 
Fix test `unit.modules.test_kubernetes` on Windows
 2018-10-11 08:57:53 -04:00
twangboy
476cbc07f0
Fix syntax error 2018-10-10 14:35:09 -06:00
twangboy
da34a9e93a
Fix failing test on Py3 and Linux 2018-10-10 14:33:39 -06:00
Nicole Thomas
196675b4df
Merge pull request #49952 from twangboy/fix_test_terraform 
Fix `unit.roster.test_terraform` for Windows
 2018-10-10 09:47:14 -04:00
Nicole Thomas
6279d83b6e
Merge pull request #49956 from twangboy/fix_test_file 
Fix `unit.states.test_file` for Windows
 2018-10-10 09:43:00 -04:00
twangboy
4afbdf2763
Fix unit.utils.test_jinja for Windows 
Fixes `unit.utils.test_jinja` on Windows
- Basically fixes some path seperators
 2018-10-09 15:38:47 -06:00
twangboy
9581427df9
Fix unit.states.test_file for Windows 
Fixes `unit.states.test_file` on Windows
- Fixes path seperators mostly
 2018-10-09 15:19:29 -06:00
twangboy
e524bef352
Use unicode literals, fix paths 2018-10-09 13:17:33 -06:00
twangboy
7e876d9d24
Use tmp instead of temp for cross platform 2018-10-09 11:47:41 -06:00
twangboy
65284f2254
Fix issue with test for path in Windows 2018-10-09 11:41:59 -06:00
rallytime
dbbfb0d2d4
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/minion.py
  - salt/utils/data.py
 2018-09-30 12:36:52 -04:00
Nicole Thomas
fccc08cb31
Merge pull request #49815 from isbm/isbm-ipv6-scope-errors-2018.3 
Bugfix/rework: IPv6 scope errors (bp)
 2018-09-28 15:44:58 -04:00
Bo Maryniuk
c14f26f351 Reverse skipping tests: if no ipaddress 2018-09-28 16:31:22 +02:00
Bo Maryniuk
bb37ba0578 Add IPv6 scoped test 2018-09-28 15:49:05 +02:00
Bo Maryniuk
facb34a6cc Add additional check 2018-09-28 15:43:39 +02:00
Bo Maryniuk
615b09aea1 Lintfix: W0611 2018-09-28 15:43:26 +02:00
Bo Maryniuk
0498e946f9 Fix ipaddress imports 2018-09-28 15:34:05 +02:00
Erik Johnson
ac0f8000d8
Fix 3 bugs in subdict matching 
1. Non-ascii was causing a UnicodeDecodeError when matching
2. Matching a dict value after a wildcard (i.e. the key is the wildcard)
   did not work. This is because it was matching the pattern against the
   key, instead of the value as it should have.
3. It was not possible to use a wildcard for the first level of
   matching.
 2018-09-26 13:26:39 -05:00
Nicole Thomas
1db2d2e4d0
Merge pull request #48809 from cro/matcher_in_loader2 
Matcher in loader, take 4
 2018-09-26 09:22:39 -04:00
rallytime
7e0db5cb15
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-09-25 15:18:00 -04:00
Erik Johnson
0125185fdb
lint 2018-09-24 15:54:49 -05:00
Erik Johnson
b829729fec
Fix pillar unit tests to work properly with loader-based matchers 2018-09-24 15:43:19 -05:00
C. R. Oldham
34d3ef0900
Remove Matcher class and use the bare loader. 2018-09-21 09:35:58 -06:00
cstarke
4f8476b2ad Fix tests; add test for CommandExecutionError 2018-09-21 11:39:43 +02:00
cstarke
3c96dd2b5e Fix tests for parallels module 2018-09-20 16:46:22 +02:00
rallytime
9298304ce9
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-19 14:07:06 -04:00
rallytime
d19c67f619
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-09-19 09:59:32 -04:00
Gareth J. Greenaway
f4ccc75587
Removing mocking of os.path.join from two tests, one of which was failing when used with coverage argument. No reason we should be mocking os.path.join. 2018-09-18 16:58:48 -06:00
rallytime
17d0a878fa
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/whitelist.txt
 2018-09-18 10:11:34 -04:00
rallytime
a8a38205e7
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/unit/utils/test_stringutils.py
 2018-09-14 09:33:33 -04:00
rallytime
ca80ccec6b
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/states/test_pip_state.py
 2018-09-13 17:14:09 -04:00
rallytime
186f57eede
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/network.py
 2018-09-13 17:11:18 -04:00
Nicole Thomas
370de07617
Lint: Add extra blank line 2018-09-12 17:05:34 -04:00
Gareth J. Greenaway
27b93fcc68
Moving the test_build_whitespace_split_regex test into the TestBuildWhitespaceRegex class. 2018-09-12 14:38:10 -06:00
rallytime
bd5ec82921
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/runners/nacl.py
  - salt/tops/varstack_top.py
  - tests/unit/states/test_linux_acl.py
 2018-09-12 12:47:09 -04:00
rallytime
b628ad729b
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-09-12 12:35:00 -04:00
Nicole Thomas
7042fc0f75
Merge pull request #49580 from garethgreenaway/fixing_failing_test_python_3_7 
[2018.3] Fixing tests for Python 3.7
 2018-09-12 12:33:35 -04:00
Nicole Thomas
ab19082a7a
Merge pull request #49606 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-09-12 10:26:33 -04:00
Nicole Thomas
c1f97c4733
Merge pull request #49532 from meaksh/2018.3-fix-linux_acl-recursive-problems 
Fix wrong 'recurse' behavior on for linux_acl.present/absent states
 2018-09-12 10:16:15 -04:00
rallytime
0f3881ab4f
Skip flaky test on Python 3 
Even with the flaky decorator, this test sometimes passes and sometimes fails.

Let's skip it for now.
 2018-09-11 14:15:52 -04:00
rallytime
c168268229
Update old utils paths to use new paths 2018-09-11 12:54:50 -04:00
rallytime
41a2586fc0
Add file coding line at top of file 
This was accidentally removed during a merge conflict resolution
 2018-09-10 12:45:43 -04:00
Gareth J. Greenaway
7df3bebf53
Fixing lint. 2018-09-10 12:43:55 -04:00
Gareth J. Greenaway
5fee38d1db
Fixes various tests that were failing under python 3.7. 2018-09-10 12:43:55 -04:00
rallytime
1a24489b29
Update old utils paths to use new utils paths 2018-09-10 09:05:14 -04:00
rallytime
f6943f0241
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-10 09:01:27 -04:00
Gareth J. Greenaway
b6afdae7c9
Fixing lint. 2018-09-07 20:17:00 -07:00
Gareth J. Greenaway
d2fb68c8ed
Fixes various tests that were failing under python 3.7. 2018-09-07 20:17:00 -07:00
Daniel A Wozniak
aa07b3fa43
Multiple unittest fixes for 2018.3 Python 3 Windows 2018-09-07 15:16:56 -07:00
rallytime
49afc328b5
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - .github/CODEOWNERS
 2018-09-07 16:21:13 -04:00