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
79,709 Commits 24 Branches 182 Tags 341 MiB
1cdf5ea737
Commit Graph

128 Commits

Author SHA1 Message Date
Erik Johnson
1cdf5ea737 PY3 compatibility fixes to netapi tests 2017-03-22 16:09:56 -05:00
rallytime
fe4a208569 Add flaky decorator to flaky rest_tornado test 2017-03-14 16:30:54 -06:00
rallytime
e7fa367548 [develop] Fix pylint error 2017-03-09 13:04:51 -07:00
Nicole Thomas
2f0f7cd224 Merge pull request #39897 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-09 09:03:46 -07:00
Pedro Algarvio
06c063a609
Test assertion cannot be done in the callback context 2017-03-08 18:34:34 +00:00
Pedro Algarvio
07d0a5ed20
Cleanup after ourselves 2017-03-08 18:34:32 +00:00
rallytime
4fc9b5484b Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/pillar/makostack.py
  - tests/integration/client/test_runner.py
  - tests/integration/states/test_file.py
 2017-03-08 09:04:26 -07:00
Pedro Algarvio
7b4d849540
Moved some test supporting modules to tests/support 
Previously they were in tests/utils which also had test case modules.
 2017-03-02 19:56:05 +00:00
Mike Place
523e377b33
Disable one API test that is flaky 2017-03-02 09:16:43 -07:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt. 
Let's drop the salttesting dependency cycle.
 2017-02-28 22:52:49 +00:00
Pedro Algarvio
1daa2e24cd
Moved some test supporting modules to tests/support 
Previously they were in tests/utils which also had test case modules.
 2017-02-28 22:52:48 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00:00
Pedro Algarvio
fc59d5e832 Python 3 Fixes (Pt. 2) (#39397) 
* Typo in comment

* First convert to string if not already a string. Then to bytes under Py3.

The reason being that jids from the CLI, at least the one fed in
integration.runners.jobs.ManageTest.test_loopup_jid is loaded as an
integer, and, while the Py2 code converts JIDs to strings, under Py3, we
assume JID's are already strings.

* Mark tests which require root permissions to run

* Allow declaring that the function IS a class method.

```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> class Foo:
...     def bar(self):
...         print('bar')
...
>>> import inspect
>>> inspect.ismethod(Foo.bar)
False
>>> inspect.ismethod(Foo().bar)
True
```

On Python 2, `inspect.ismethod` returns `True` for bound and unbound
methods while on Python 3 it only returns `True` for bound methods.
The explicit `is_class_method` is to avoid instantiating the class just
to get the function signature.

* Always decode responses to the Python version native string implementation

* Just compare the objects as matching list.

Asserting same item count doesn't make that much sense.

* Py3 compatibility

* Fix saltnado tests under Py3

* Python 3 compatibility

* Show me the full traceback

* Revert "Convert fileserver data from bytes to strings"

This reverts commit e53972f8c6.

* Revert "Under Py3, we get `bytes` when using the roots backend directly"

This reverts commit 9f73b240c1.

* Convert from bytes to str if not a binary file

* Py3 compatibility fixes.

Convert file contents from bytes to string if not a binary file
 2017-02-14 16:20:56 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
rallytime
34282322c0 Clean up tests and docs for batch execution 
Batch execution was removed from NetapiClient and Saltnado in
previous commits. This change is a follow up that removes related
test cases and doc references.
 2017-01-09 11:29:34 -07:00
Mike Place
a85ab3e59c Just check for keys, not compare all keys for wheel netapi test 2016-08-21 22:17:27 +09:00
Mike Place
2b7b4eb4ca Fix wheel test 
This aligns with the new test layout
 2016-08-03 03:53:15 +09:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-19 10:31:07 -06:00
rallytime
3e032dc397 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-19 09:30:45 -06:00
Mike Place
46901c6e65 Disable test 
There's a race condition in here somewhere. Disabling and tracking issue elsewhere.
 2016-07-18 12:39:49 -06:00
Aditya Kulkarni
df6296e3ce Replace args and kwargs (plural) by arg and kwarg (singular) for `RunnerClient` (#32938) 
* Replace args and kwargs (plural) by arg and kwarg (singular)

* Add test and deprecation warning

* Add deprecation warning
 2016-05-05 07:31:08 -07:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
 2016-04-26 14:42:26 -06:00
Justin Findlay
5a4398a746 netapi.rest_cherrypy: use unsalted PW on MacOS (#32850) 2016-04-26 11:04:25 -06:00
rallytime
eb6773823b Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/rh_service.py
 2016-04-01 10:33:44 -06:00
rallytime
e8658697a6 Pylint fix for integration import 2016-03-28 16:56:22 -06:00
rallytime
527bc3e491 Pylint fix 2016-03-28 11:24:45 -06:00
rallytime
e9abd2d420 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/rh_service.py
 2016-03-28 10:51:23 -06:00
Ch3LL
ba605b0128 fix more pylint and add ability to close cherrypy engine 2016-03-25 12:06:39 -06:00
Ch3LL
2d4dc4da05 add teardown call 2016-03-14 16:45:27 -06:00
Ch3LL
d115878714 fix pylint error 2016-03-14 13:45:59 -06:00
root
4c1ab082b6 add pam salt-api tests 2016-03-14 19:19:06 +00:00
kstreee
91b5dc7048 [saltstack/salt#31534] Resolve a bug that rest_tornado doesn't response for 1. invalid request, 2. dictionary type of request, and add test cases for it. 
Typo in __init__.py
 2016-02-29 17:59:16 +09:00
Seth House
e47fe835c9 Remove mocks from rest_cherrypy integration tests 
These mocks predated the inclusion of salt-api into Salt core. They are
now no longer needed and counter-productive.
 2015-09-09 10:39:35 -06:00
Seth House
6d22514934 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-09 10:39:34 -06:00
Seth House
d68aefcfde Remove mocks from rest_cherrypy integration tests 
These mocks predated the inclusion of salt-api into Salt core. They are
now no longer needed and counter-productive.
 2015-09-08 15:40:06 -06:00
Seth House
2aa3da8911 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-08 15:40:06 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
Thomas Jackson
bc32f66b98 Add runner_async endpoint to salnado 
Feature for #25427
 2015-07-15 09:07:26 -07:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
 2015-06-29 16:49:40 -06:00
Thomas Jackson
87adca46e0 Fix memory leak in saltnado 
Fixes #24846

If an event was checked after the request was closed out it was possible for requests to get into the event_listener's mapping and never be cleaned out. This fixes the leak by checking if the request is open or not before adding it to the mappings.
 2015-06-25 09:06:33 -07:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00
Justin Findlay
6b6280442c disable intermittently failing tests 
This commit is to be reverted when #23623 is merged.
 2015-05-28 16:23:57 -06:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
 2015-04-27 10:28:53 -06:00
rallytime
8d5b50e17c Don't forget the blank lines at the end of the file 2015-04-24 16:29:51 -06:00
rallytime
9830708f86 Some small test clean up changes 2015-04-24 16:27:22 -06:00
Colton Myers
11356cb0c6 Use print_function 2015-04-16 12:16:44 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Colton Myers
a02ced40f0 Lint 2015-04-14 12:57:25 -06:00