Commit Graph

3254 Commits

Author SHA1 Message Date
rallytime
9531ea6ef5 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/topics/highavailability/index.rst
  - salt/loader.py
  - salt/modules/service.py
  - salt/states/cmd.py
  - tests/unit/states/cmd_test.py
2016-04-07 16:10:32 -06:00
Nicole Thomas
0809126d8e Merge #32293 with test fixes (#32418)
* Fix issue #11497

* Remove check for working directory presence in tests
2016-04-07 14:55:25 -06:00
Justin Anderson
6f98bd50eb Update glusterfs_test to be inline with #32312 2016-04-07 14:38:21 -06:00
Bo Maryniuk
0d9a06b8c6 Cleaner deprecation process with decorators
* Add deprecation decorator scaffold

* Capture type error and unhandled exceptions while function calls

* Aware of the current and future version of deprecation

* Implement initially is_deprecated decorator

* Add an alias for the capitalization

* Fix capitalization easier way

* Remove an extra line

* Add successor name to the deprecation decorator.

* Granulate logging and error messages.

* Implement function swapper

* Raise later the caught exception

* Clarify exception message

* Save function original name

* Remove an extra line

* Hide an alternative hidden function name in the error message, preserving the error itself

* Rename variable as private

* Add a method to detect if a function is using its previous version

* Message to the log and/or raise an exception accordingly to the status of used function

* Log an error along with the exception

* Add internal method documentation

* Add documentation and usage process for decorator "is_deprecated"

* Add documentation and process usage for the decorator "with_deprecated"

* Hide private method name

* Fix PEP8, re-word the error message

* Deprecate basic uptime function

* Add initial decorator unit test

* Rename old/new functions, mock versions

* Move frequent data to the test setup

* Add logging on EOL exception

* Rename and document high to low version test on is_deprecated

* Implement a test on low to high version of is_deprecated decorator

* Add a correction to the test description

* Remove a dead code

* Implement a test for high to low version on is_deprecated, using with_successor param

* Correct typso adn mistaeks

* Implement high to low version with successor param on is_deprecated

* Setup a virtual name for the module

* Implement test for with_deprecated should raise an exception if same deprecated function not found

* Implement test for with_deprecated an old function is picked up if configured

* Correct test description purpose

* Implement test with_deprecated when no deprecation is requested

* Add logging test to the configured deprecation request

* Add logging testing when deprecated version wasn't requested

* Implement test EOL for with_deprecated decorator

* Correct test explanation

* Rename the test

* Implement with_deprecated no EOL, deprecated other function name

* Implement with_deprecated, deprecated other function name, EOL reached

* Add test description for the with_deprecated + with_name + EOL

* Fix confusing test names

* Add logging test to the is_deprecated decorator when function as not found.

* Add more test point to each test, remove empty lines

* Bugfix: at certain conditions a wrong alias name is reported to the log

* Fix a typo in a comment

* Add test for the logging

* Disable a pylint: None will _never_ be raised

* Fix test for the deprecated "status.uptime" version

* Bugfix: Do not yank raised exceptions

* Remove unnecessary decorator

* Add test for the new uptime

* Add test for the new uptime fails when /proc/uptime does not exists

* Rename old test case

* Skip test for the UTC time, unless freeze time is used.

* Fix pylint

* Fix documentation

* Bugfix: proxy-pass the docstring of the decorated function

* Lint fix
2016-04-06 12:55:45 -06:00
Mike Place
edbab99164 Merge pull request #32295 from rallytime/test-cloud-deploy-dir
Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config
2016-04-04 11:38:47 -06:00
Benjamin Drung
8cada9573f Fix typos of retrieve 2016-04-04 14:27:41 +02:00
rallytime
4037476f40 Patch call to os.path.isdir so we know both search paths are in tuple 2016-04-01 15:13:57 -06:00
rallytime
49a4eec051 Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config
Refs #32183
2016-04-01 09:40:58 -06:00
Erik Johnson
3e374e7ec6 Merge pull request #32243 from isbm/isbm-zypper-list-installed-ensure-latest
Ensure latest pkg.info_installed ensure latest
2016-03-31 11:09:59 -05:00
Bo Maryniuk
73ad8a2bfc Fix lint 2016-03-31 01:55:38 +02:00
twangboy
5ca4ad6675 Fix unit tests for state 2016-03-30 17:12:12 -06:00
twangboy
b26cb76abb Fix unit tests 2016-03-30 16:51:58 -06:00
Bo Maryniuk
f07c7ea792 Add lowpkg tests for version comparison 2016-03-30 17:33:24 +02:00
Bo Maryniuk
afdf451d87 Remove tests from the zypper_test that belongs to rpm_test 2016-03-30 17:33:03 +02:00
Nicolas Delaby
c989ae5a7e Merge user defined labels with one carried by the image 2016-03-29 11:50:08 +02:00
rallytime
6886681410 Fix test failures 2016-03-24 16:45:03 -06:00
Brian Stevenson
1500aae027 set deleted value to list 2016-03-23 13:47:12 -07:00
Brian Stevenson
1dc8f5f289 unit test update
grain value looks for list in assertion
2016-03-23 10:50:32 -07:00
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
Nicolas Delaby
e511864a55 Fix ports exposition when protocol is passed.
fixes #32013
2016-03-21 10:44:22 +01:00
Nicole Thomas
03e8b72655 Merge pull request #31904 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-03-16 11:23:54 -06:00
Mike Place
b068eaa963 Merge pull request #31745 from isbm/isbm-always-minion-errcode-2-fix
Fix the always-false behavior on checking state
2016-03-15 17:02:19 -06:00
rallytime
892591a39c More pylint fixes 2016-03-15 15:50:05 -06:00
Christophe Drevet-Droguet
dcd6f5a5a9 test for file.apply_template_on_contents 2016-03-11 12:44:26 +01:00
Bo Maryniuk
ee1a002673 Update test case to cover SLE11 and SLE12 2016-03-10 13:26:15 +01:00
Bo Maryniuk
4b134fb2ab Add SLE11 product info snapshot, rename previous 2016-03-10 13:25:53 +01:00
Bo Maryniuk
1882e1c960 Adjust test 2016-03-08 20:08:18 +01:00
Mike Place
826fea6582 Merge pull request #31162 from isbm/isbm-md5-to-sha1
Remove MD5 digest from everywhere and default to SHA256
2016-03-07 12:11:36 -07:00
Mike Place
24568b1a5d Merge pull request #31711 from ticosax/fix-port-and-volume-discovery
[dockerng] Port and Volume comparison should consider Dockerfile
2016-03-07 11:25:19 -07:00
Mike Place
604eb87e82 Merge pull request #31713 from ticosax/fix-dockerng-networking-container_id
[dockerng] Fix dockerng.network_present when container is given by name
2016-03-07 08:14:41 -07:00
Nicolas Delaby
3837cf44ca Fix network_present by dealing with containers ID's instead of names.
Because docker inspect network returns attached containers by their Ids.
2016-03-07 10:30:58 +01:00
Nicolas Delaby
cf38691597 Port and Volume comparison should consider Dockerfile
`EXPOSE` and `VOLUME` declaration of a Dockerfile are exactly like
user declaration those parameters in their sls for dockerng.running

Considering Dockerfile containing this line:

```
EXPOSE 80
```

Those 2 sls are now considered strictly equivalent.

```yaml
container:
    dockerng.running:
      image: alpine
      ports:
        - 80/tcp
```

```yaml
container:
    dockerng.running:
      image: alpine
```
2016-03-07 10:11:52 +01:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
2016-03-06 10:59:46 -07:00
Mike Place
8b00513ebb Removed useless tests
These test nothing and break everytime the underlying implementation is changed.
2016-03-04 15:37:49 -07:00
Bo Maryniuk
9d64abed0c Fix PyLint 2016-03-03 21:44:14 +01:00
Bo Maryniuk
327ea11139 Add daemons unit test to verify hash_type settings 2016-03-03 21:44:14 +01:00
Christophe Drevet-Droguet
fc9dd356e8 test case: test_list_present_nested_already 2016-03-03 15:17:43 +01:00
Mike Place
7006a1eecf Fix failed unit test 2016-02-29 21:15:43 -07:00
Michael Calmer
1425c6496c use specialized assert functions for tests 2016-02-26 13:54:15 +01:00
Michael Calmer
f266cfdaac test _zypper_check_result() 2016-02-26 13:54:15 +01:00
Michael Calmer
aff6467782 adapt tests to new zypper_check_result() output 2016-02-26 13:54:14 +01:00
Bo Maryniuk
d30f2e4627 Implement unit test for remove and purge 2016-02-25 17:48:03 +01:00
Bo Maryniuk
bc05acf7c3 Fix PyLint 2016-02-25 14:00:12 +01:00
Bo Maryniuk
c0eab8b549 Add space before "assert" keyword 2016-02-24 17:46:49 +01:00
Bo Maryniuk
6bcb89a8f6 Implement list packages test 2016-02-24 17:45:33 +01:00
Bo Maryniuk
78837d2926 Add mocking data 2016-02-24 17:45:23 +01:00
Bo Maryniuk
0b64b8137f Implement test for version compare, where python fall-back algorithm is called 2016-02-24 17:24:23 +01:00
Bo Maryniuk
18b30a3274 Implement test for version compare, where RPM algorithm is called 2016-02-24 17:24:05 +01:00
Bo Maryniuk
59eca53441 Adjust test case for the third package in the test static data 2016-02-24 16:06:53 +01:00
Bo Maryniuk
8034cf0b91 Add third test package static info 2016-02-24 16:06:33 +01:00