Commit Graph

6701 Commits

Author SHA1 Message Date
twangboy
c011a176f5 Add integration tests 2016-03-19 17:04:42 -06:00
twangboy
3d7ff12019 Fix line lengths 2016-03-18 17:59:07 -06:00
twangboy
787835a13a Fix tests for sleep functions 2016-03-18 17:57:02 -06:00
twangboy
a15aaff241 Add remaining integration tests 2016-03-18 17:36:49 -06:00
twangboy
2517abafca Integration tests for sleep functions 2016-03-18 17:11:35 -06:00
twangboy
ed1fbecfea Integration test framework 2016-03-18 15:55:57 -06:00
twangboy
894151b334 Fix test_schedule test 2016-03-18 14:53:26 -06:00
twangboy
0099ccb256 Finished integration tests 2016-03-18 14:42:03 -06:00
twangboy
0bf1672daf Fix set_catalog function 2016-03-18 14:40:03 -06:00
twangboy
fcf0ce2c7b Fix get_catalog 2016-03-18 14:29:21 -06:00
twangboy
73f51a39ed Add checks to download 2016-03-18 14:22:15 -06:00
twangboy
182b80d67e Refactor update 2016-03-18 14:12:31 -06:00
twangboy
12668fe447 Fix integration tests
Code refactoring
Put cmd in lists
2016-03-18 13:53:40 -06:00
rallytime
a110b4d55d Don't overwrite previously mocked grains 2016-03-18 13:29:08 -06:00
twangboy
00e6aaa2f0 Use available 2016-03-18 13:06:19 -06:00
rallytime
fa4650523e Pylint fixes 2016-03-18 12:21:09 -06:00
twangboy
972e11db24 Improve error handling for mac_softwareupdate 2016-03-18 11:30:33 -06:00
twangboy
56c0abc4a5 Fix list_upgrades test 2016-03-18 11:30:33 -06:00
twangboy
3114357b13 Add integration tests for mac_softwareupdate 2016-03-18 11:30:33 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
2016-03-18 11:26:12 -06:00
Nicole Thomas
00f5fedf53 Merge pull request #31955 from jtand/merge-31926-with-fixes
Disable some boto tests causing issues in the test suite on 2016.3
2016-03-18 09:50:37 -06:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -06:00
Nicole Thomas
fb6d5fa44b Merge pull request #31946 from rallytime/merge-31886
Fix pylint for #31886
2016-03-17 09:45:10 -06:00
rallytime
98267ca100 Fix pylint for #31886
Merges #31886
2016-03-17 09:01:59 -06:00
Ch3LL
1a2a79113b fix pylint 2016-03-16 21:23:10 -06:00
Ch3LL
b761059405 add absolute_import 2016-03-16 20:58:41 -06:00
Pedro Algarvio
cb196803fd
Skip boto tests which are pegging CPU and eating all available RAM. 2016-03-17 01:01:24 +00:00
Pedro Algarvio
2fcc916c6a
Make sure all started processed, at least and as a last resort, are killed. 2016-03-16 19:40:49 +00:00
Pedro Algarvio
e1281e34cc
Don't assume the tests suite is running as root 2016-03-16 19:40:49 +00:00
Pedro Algarvio
916b6b402d
Skip tests if urllib3 is not installed 2016-03-16 19:40:48 +00:00
Ch3LL
5bcc5b2f21 fix pylint and remove super() 2016-03-16 11:44:55 -06: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
rallytime
35b2076584 Pylint fixes 2016-03-15 14:55:35 -06:00
rallytime
85e5acd11a Merge #31903 with pylint fix
Merges #31903
2016-03-15 14:05:09 -06:00
Mike Place
c28fc6e1d8 Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable
Hotfix/windows proxy enable
2016-03-15 12:58:33 -06:00
Daniel Hobley
415cc8efab Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
Erik Johnson
394410e2b0 Add integration test for depends decorator 2016-03-14 22:16:10 -05:00
Daniel Hobley
55f7ab1fba Fixed a bug where a cert was not correctly updated
If the certificate supplied had a different hash than the previous but the name was the same the change was ignored, this commit fixes that.
2016-03-11 11:52:15 -06:00
Christophe Drevet-Droguet
dcd6f5a5a9 test for file.apply_template_on_contents 2016-03-11 12:44:26 +01:00
Ch3LL
3c03d9bd57 add mac_defaults test 2016-03-10 16:34:18 -07:00
Ch3LL
29f0c65f6f renamed brew.py to mac_brew.py and added tests 2016-03-10 16:27:40 -07:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
2016-03-10 13:13:35 -07:00
Nicole Thomas
75dfb2ed40 Merge pull request #31797 from Ch3LL/fix_pkginfo_test
Change pkg name to less for suse pkg.info_installed test
2016-03-10 12:08:16 -07:00
Ch3LL
910f0d9ffc change pkg name to less for suse 2016-03-10 11:18:44 -07:00
Justin Findlay
e46bac2d98 transport.tcp unit tests: disable hanging tests 2016-03-10 10:57:21 -07:00
Justin Findlay
992a8af726 renderers.gpg unit tests: mock gpg command 2016-03-10 10:57:21 -07:00
Justin Findlay
e0abe23c7e states.ssh int tests: run both test cases manually 2016-03-10 10:57:21 -07:00
Justin Findlay
d33b365984 states.pkg int tests: add pkgs for MacOS 2016-03-10 10:57:21 -07:00
Justin Findlay
431a247b66 states.cmd int tests: echo is more portable than true 2016-03-10 10:57:21 -07:00
Justin Findlay
7c48cf7ea6 states.user int tests: check MacOS primary group 2016-03-10 10:57:20 -07:00
Justin Findlay
5d5ce619b7 states.user int tests: disable GECOS for MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
aa61e1056f states.file int tests: find root's primary group 2016-03-10 10:57:20 -07:00
Justin Findlay
08493d85fd states.file unit tests: mark tests destructive for touching file 2016-03-10 10:57:20 -07:00
Justin Findlay
7a8061cc1e states.file unit tests: use existing file for unmocked tests 2016-03-10 10:57:20 -07:00
Justin Findlay
fe2fd3f993 modules.ps unit tests: check ps __virtual__ 2016-03-10 10:57:20 -07:00
Justin Findlay
eb2964d517 modules.mount unit tests: mock /etc/fstab 2016-03-10 10:57:20 -07:00
Justin Findlay
328d058f22 modules.linux_sysctl unit tests: mock ctl presence 2016-03-10 10:57:20 -07:00
Justin Findlay
590c0ad986 modules.btrfs unit tests: mock /proc/mounts 2016-03-10 10:57:20 -07:00
Justin Findlay
424a8b11bd modules.pw_group: mock (BSD) test to run on MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
2fe1160143 modules.mac_user.primary_group: add integration test 2016-03-10 10:57:19 -07:00
Justin Findlay
5905518ee5 modules.mac_user int tests: fix comment typo 2016-03-10 10:57:19 -07:00
Justin Findlay
fea37b303e modules.mac_user int tests: move common decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
e53ae6c44e modules.useradd.primary_group: add integration test 2016-03-10 10:57:19 -07:00
Justin Findlay
ba19f395d1 modules.useradd int tests: disable testcase on nonlinux 2016-03-10 10:57:19 -07:00
Justin Findlay
ddea2361de modules.useradd int tests: move decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
f69ab83623 modules.disk int tests: mtab not used on darwin 2016-03-10 10:57:19 -07:00
Justin Findlay
d818810200 modules.disk int tests: move decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
bdb210dc13 modules.disk int tests: assert darwin disk usage 2016-03-10 10:57:19 -07:00
Justin Findlay
73ad02e917 modules.disk: run both integration test cases manually 2016-03-10 10:57:19 -07:00
Justin Findlay
0098c1c554 modules.blockdev test: mock utils.which 2016-03-10 10:57:19 -07:00
Justin Findlay
2f1c0cf809 shell tests: strip whitespace from shell return 2016-03-10 10:57:19 -07:00
Justin Findlay
c94dfb870f shell tests: comment on shell return data 2016-03-10 10:57:19 -07:00
Justin Findlay
34ba477b09 tests.runtests: configurable filehandle limits 2016-03-10 10:57:18 -07:00
Justin Findlay
3a77e7d383 tests.runtests: increase file limit for MacOS unit tests 2016-03-10 10:57:18 -07:00
Justin Findlay
4028d80eee tests...runtests_helpers: use system tmpdir 2016-03-10 10:57:18 -07:00
Justin Findlay
6b99798b1e tests.integration: use system tmpdir on darwin 2016-03-10 10:57:18 -07: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
Daniel Hobley
14ddae0aa8 Fixed installing keychain certificates from salt fileserver 2016-03-09 18:16:47 -06:00
rallytime
46d29e7594 Fix daemons test logger --> log references 2016-03-09 10:51:07 -07:00
Bo Maryniuk
1882e1c960 Adjust test 2016-03-08 20:08:18 +01:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07: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
Matthew Cillo
ba33d75949 passing lint test 2016-03-06 17:19:08 -05: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
Nicole Thomas
d7914cdb14 Merge pull request #31687 from cachedout/rm_gpg_test
Removed useless GPG tests
2016-03-04 17:08:27 -07:00
twangboy
75546eadaf Fix tests for mac_utils 2016-03-04 16:36:02 -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
rallytime
beb9d0fe84 Ensure all integration test classes and funcs are documented w/examples 2016-03-04 12:13:27 -07:00
twangboy
6cf7a4b364 Add missing import 2016-03-04 10:55:23 -07:00
twangboy
5d6de86a25 Fix some lint 2016-03-04 10:53:11 -07:00
twangboy
88d5db9cdd Add tests for remaining functions 2016-03-04 10:53:11 -07:00
twangboy
69aa8f8cbf Add test for execute_return_success 2016-03-04 10:53:11 -07:00
Erik Johnson
da954d7b92 Add integration test for packages with epoch in version
This starts with cent7, but later I can add cent6 as well.
2016-03-03 15:40:22 -06: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
twangboy
e953d34492 Add back skipIf decorator 2016-03-03 10:45:57 -07:00
twangboy
2c4c81f55d Remove mock tests, only test _validate_minutes 2016-03-03 08:54:03 -07:00
twangboy
c181e9fcc5 Merge branch '2016.3' of https://github.com/saltstack/salt into mac_power_tests 2016-03-03 08:52:51 -07:00
Christophe Drevet-Droguet
fc9dd356e8 test case: test_list_present_nested_already 2016-03-03 15:17:43 +01:00
rallytime
ac69e4bf10 Fix merge bug caught by zypper test and user correct zypper test info 2016-03-02 12:19:47 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
twangboy
33da2c613e Add tests for the remainder of the functions 2016-03-02 10:20:00 -07:00
Nicole Thomas
36ce240596 Merge pull request #31583 from vutny/remove-trailing-white-spaces
Remove trailing white spaces
2016-03-02 08:38:01 -07:00
Denys Havrysh
86433f2378 Revert changes in files used by roots_test.py integration test 2016-03-02 10:00:45 +02:00
Justin Findlay
cbb28492a3 modules.mac_power: add unit tests 2016-03-01 12:19:04 -07:00
Denys Havrysh
e7a8dbf498 Remove trailing white spaces in tests files 2016-03-01 17:40:02 +02:00
Mike Place
7006a1eecf Fix failed unit test 2016-02-29 21:15:43 -07:00
Mike Place
ada5ab344d Merge pull request #31561 from jtand/beacons_test_fix
Skipped test
2016-02-29 21:11:22 -07:00
justinta89
196dd4db99 Skipped test 2016-02-29 14:21:19 -07:00
rallytime
b683df9b82 Pylint fix 2016-02-29 11:12:55 -07:00
rallytime
24505d2dcf Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/client/ssh/state.py
  - salt/fileclient.py
  - salt/minion.py
2016-02-29 10:47:40 -07:00
Erik Johnson
0d352bbc16 Add fileclient tests 2016-02-29 01:05:33 -06: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
rallytime
a41ce26287 Actually mock cmd.run_all call... 2016-02-25 15:11:25 -07:00
Ch3LL
29a53f4353 rename methods in pkg states test 2016-02-26 06:54:01 +09:00
rallytime
e8f5f9b67a Fix zypper_test: Zypper function uses cmd.run_all, not cmd.run in 2016.3 2016-02-25 14:23:36 -07:00
Nicole Thomas
625da0d261 Merge pull request #31471 from cachedout/issue_31427
Correct issue where duplicate items in grains list during state run will result in duplicate grains
2016-02-25 13:15:20 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
2016-02-25 12:36:22 -07:00
Bo Maryniuk
d30f2e4627 Implement unit test for remove and purge 2016-02-25 17:48:03 +01:00
Mike Place
fb1ef92e2b Merge pull request #31411 from jtand/beacons_tests
Added some beacons execution module integration tests
2016-02-25 09:16:26 -07:00
Mike Place
f027dc0cf8 Merge pull request #31479 from isbm/isbm-zypper-unittest
Zypper unit tests & fixes
2016-02-25 08:58:15 -07:00
Bo Maryniuk
bc05acf7c3 Fix PyLint 2016-02-25 14:00:12 +01:00
Mike Place
30eb5fccf7 Additional tests, but disable the test for distinct lists, because of a problem with context in test suite 2016-02-24 13:53:49 -07:00
Mike Place
3d2aec05e5 Check for duplicate grains during list insertion
Insert grains into context so that we can know if we're duplicating during multiple inserts in a state run.

Refs #31427
2016-02-24 11:43:24 -07:00
Mike Place
987dd89979 Merge pull request #31445 from rallytime/fix-31366
Only use LONGSIZE in rpm.info if available. Otherwise, use SIZE.
2016-02-24 11:35:31 -07:00
Mike Place
979c8b4faa Merge pull request #31464 from Ch3LL/fix_int_test
integartion test: ensure decorator only runs on one method and not class
2016-02-24 11:35:00 -07:00
justinta89
7d32b56015 Added some more checks to verify beacon changes were actually happening 2016-02-24 10:38:23 -07:00
Erik Johnson
f107d1a288 Support running grains tests 2016-02-24 10:28:10 -07:00
Erik Johnson
9da467aec7 Rename core.py to core_test.py 2016-02-24 10:15:01 -07:00
Erik Johnson
468c637032 Add unit test for core grains 2016-02-24 10:15:01 -07:00
C. R. Oldham
db7b675b09 We need one more mocked return from listdir. 2016-02-24 10:15:00 -07:00
Nicolas Delaby
d2bcc37416 Pull missing images when calling dockerng.running
fixes #29727
2016-02-24 10:08:03 -07:00
justinta89
2da5285c03 Added codeauthor 2016-02-24 09:56:11 -07:00
Ch3LL
a387d175d8 integartion test- ensure decorator only runs on one method and not entire class 2016-02-25 01:55:35 +09:00
rallytime
9965fe188a Added to pkg.info_installed test for RedHat and Suse systems 2016-02-24 09:50:52 -07: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
Mike Place
e553f18dc4 Merge pull request #31439 from rallytime/fix-31370
Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name
2016-02-24 09:24:46 -07: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