valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
78,637 Commits 24 Branches 182 Tags 341 MiB
2a76618b17
Commit Graph

78637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
2a76618b17
Fix templates for the new test module naming scheme 2017-02-23 23:19:44 +00:00
Pedro Algarvio
8337a164ee
Make sure we have the required library before even calling vb_machine_exists 2017-02-23 23:19:44 +00:00
Pedro Algarvio
ea2cb8470e
Py2 compat 2017-02-23 23:19:44 +00:00
Pedro Algarvio
fbc2af52fc
Full module path import 2017-02-23 23:19:44 +00:00
Pedro Algarvio
2ebb0a56cc
Port some more options of runtests.py 2017-02-23 23:19:44 +00:00
Pedro Algarvio
9bd7f60b8a
Add a pytest pip requirements file with what we currently need 2017-02-23 23:19:43 +00:00
Pedro Algarvio
bb5757c74f
A little hackish but enough to prove it runs 2017-02-23 23:19:43 +00:00
Pedro Algarvio
cb7a25e4a2
Somehow salt.utils.boto3 is "landing" as boto3 in sys.modules 2017-02-23 23:19:43 +00:00
Pedro Algarvio
1e2753c875
Fix imports after renames 2017-02-23 23:19:43 +00:00
Pedro Algarvio
5576f6ed33
Gate it! 2017-02-23 23:19:42 +00:00
Pedro Algarvio
bc728001a7
Start laying out py.test conftest.py. Add destructive_test marker support. 2017-02-23 23:19:42 +00:00
Pedro Algarvio
5d5a3ee01e
All tests now follow the test_*.py pattern. 2017-02-23 23:19:42 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00:00
Mike Place
24052c1378 Merge pull request #39493 from mchugh19/develop 
Define ret before use
 2017-02-23 12:26:01 -07:00
Mike Place
b004d4513d Merge pull request #39555 from sergeizv/fix-unbound-local-error 
Fix UnboundLocalError
 2017-02-23 12:13:25 -07:00
Mike Place
87aa4a5dc0 Merge pull request #39590 from raazvvann/dev/rheghedu/system-comments 
system: multi line support in computer description
 2017-02-23 11:43:23 -07:00
Mike Place
cc0c930392 Merge pull request #39598 from cloudflare/redis-hash-versionadded 
Specify versionadded for redismod hash functions
 2017-02-23 11:14:29 -07:00
Erik Johnson
ec8b77cb03 Merge pull request #39597 from ticosax/simplify-timeout-handling 
docker.APIClient constructor already accept timeout argument
 2017-02-23 11:14:21 -06:00
Erik Johnson
1b4dbf250b Merge pull request #39589 from MasterNayru/fix-s3-fileclient-local 
Allow masterless minions to pull files from S3
 2017-02-23 11:06:26 -06:00
Nicole Thomas
ea14ba8642 Merge pull request #39587 from steinliber/repair-destory-aliyun-error 
Repair destory aliyun error
 2017-02-23 09:59:32 -07:00
Mircea Ulinic
6761021be9 Specify versionadded for hash functions 
Added in https://github.com/saltstack/salt/pull/37421
but not included in Carbon.
 2017-02-23 14:28:45 +00:00
Nicolas Delaby
b8a558e379 docker.APIClient constructor already accept timeout argument 2017-02-23 15:25:47 +01:00
Pedro Algarvio
7ad11ff104 Merge pull request #39571 from s0undt3ch/features/py3 
Moar Py3 fixes
 2017-02-23 13:10:01 +00:00
Pedro Algarvio
ce71f6d45f
Code cleanup 2017-02-23 12:55:53 +00:00
Pedro Algarvio
872d173769
The unicode type does not exist on Py3 2017-02-23 12:55:52 +00:00
Pedro Algarvio
9bb56da613
Fix skipIf call and _docker_py_version 2017-02-23 12:55:52 +00:00
Jarrod Moore
3a74da3fb2 Set utils property explicitly for FSClient 2017-02-23 22:49:00 +11:00
Pedro Algarvio
80ded62a1a
The dictionary changes while iterating. 
Under Python 3, we don't get a list copy of the keys.
 2017-02-23 10:40:59 +00:00
Pedro Algarvio
a3d514476f
Only convert bytes 2017-02-23 10:40:59 +00:00
Pedro Algarvio
1416dd2e9a
We must compare tuples 2017-02-23 10:40:59 +00:00
Pedro Algarvio
8dc1c780b7
Add missing mock patch 2017-02-23 10:40:58 +00:00
Pedro Algarvio
e48ea8fa1b
Don't use assert_called_once() or assert_not_called(). 
These worked in Py2 but not in Py3.
A read of http://engineroom.trackmaven.com/blog/mocking-mistakes/ specially the section "Mocking the unexpected" will enlighten one.
 2017-02-23 10:40:58 +00:00
Pedro Algarvio
e16dc832b2
Code cleanup. Tests are not destructive. Py3 compat. 2017-02-23 10:40:58 +00:00
Jarrod Moore
fad2a064ab Allow masterless minions to pull files from S3 2017-02-23 21:27:24 +11:00
stein
ba986ce99e add stop instance before destroy 2017-02-23 16:09:45 +08:00
stein
d07cf594e0 add stop instance before destroy 2017-02-23 16:07:38 +08:00
Mike Place
43e3cafac5 Merge pull request #39580 from twangboy/win_fix_fileserver_roots_tests 
Fix fileserver roots tests for Windows
 2017-02-22 19:16:30 -07:00
Mike Place
4279c39f41 Merge pull request #39576 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-22 19:09:56 -07:00
Mike Place
2b5caa3c35 Merge pull request #39581 from rallytime/fix-lint-develop 
[develop] Fix some pylint errors that snuck into develop
 2017-02-22 19:09:28 -07:00
rallytime
5db986860c [develop] Fix some pylint errors that snuck into develop 2017-02-22 17:02:21 -07:00
twangboy
db645da0bf Fix fileserver roots tests for Windows 2017-02-22 16:53:27 -07:00
rallytime
2595ac383d Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/docker.py
  - salt/states/docker.py
 2017-02-22 16:24:36 -07:00
Mike Place
a41c4ff9c9 Merge pull request #39567 from sum12/develop 
[msgpack] look for `datetime.datetime` in keys also while packing
 2017-02-22 11:57:47 -07:00
Mike Place
7ab258868d Merge pull request #39553 from sergeizv/py3-file-mode 
Make file perms check Python 3 compatible
 2017-02-22 11:56:19 -07:00
Mike Place
79c1a915c4 Remove trailing whitespace 
Needed for lint check
 2017-02-22 11:49:44 -07:00
Mike Place
a9094ad088 Merge pull request #39504 from F30/dmidecode-warning 
Improve error handling for Grains virtual hardware identification
 2017-02-22 11:46:24 -07:00
Mike Place
6d12a8cb06 Merge pull request #39525 from zer0def/influx-query 
Added arbitrary query execution and additional parameters to continuous query creation for InfluxDB
 2017-02-22 11:33:02 -07:00
Mike Place
8cd9ee03a0 Merge pull request #39526 from theredcat/develop 
Fixes for solrcloud module
 2017-02-22 11:32:05 -07:00
Mike Place
b492f7094c Merge pull request #39528 from thatch45/ssl_docs 
Add better ssl option docs
 2017-02-22 11:29:46 -07:00
Mike Place
0dad49cdff Merge pull request #39532 from amontalban/corner_case_35869 
Fix case when /etc/localtime is a file and it is not updated
 2017-02-22 11:28:53 -07:00