valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,775 Commits 24 Branches 182 Tags 341 MiB
298e0453b8
Commit Graph

6788 Commits

Author SHA1 Message Date
hlub
1494c44918 Refactored GlusterFS support 
Usage of GlusterFS states did not change except the state 'created' was deprecated in favor of more descriptive name 'volume_present'.
- Improved separation of functionality in the execution module from the states. Module functions now return booleans instead of varying
strings. Parsing those strings in the states was very error-prone. In glusterfs.peer() function this problem was earlier solved by returning
a dict containing both the exit value and output string of the gluster call. This could be a good idea, although without calling the gluster
calls twice, and applied to other functios too.
- Calls to gluster are now logged more verbosely, while a failing call no longer raises an immediate exception.
- Improved checking and verbosity in the state level. Cleaned code a lot, removed some bugs and other odd behaviour.
- Updated tests to match the changes. Refactored some test code to be more readable. Added assertions to test that some functions are not
called when things are already in the desired state. Preferred changing behaviour of the mocked functions while proceeding instead of listing
all of the return values first.
- Replaced glusterfs.list_peers() with more informative peer_status() and deprecated the old name. The function now returns a dict with UUIDs as its keys.
- glusterfs.info() can now be called without volume name. It always returns a dictionary. Use this function instead of status() in sates.
- Functions glusterfs.delete() and glusterfs.create() were deprecated and renamed to delete_volume() and create_volume().
 2016-02-25 10:46:43 -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
e483978fc8 Merge pull request #31423 from twangboy/win_system_dev 
Fix uppercase computer names
 2016-02-25 09:15:58 -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
Justin Findlay
0fb1bbb883 tests.runtests: rename cloud provider tests 2016-02-24 22:16:57 -07:00
Justin Findlay
a98bcf6fd1 tests.runtests: reorder arg declarations 2016-02-24 22:16:57 -07:00
Justin Findlay
bc60c02cfe tests.runtests: refactor test suite usage 2016-02-24 22:16:57 -07:00
Justin Findlay
7a04ae5558 tests.runtests: add test suite data and fcns 2016-02-24 22:16:57 -07: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
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
Bo Maryniuk
90f209569a Implement test for the upgrade_available 2016-02-24 15:52:18 +01:00
Bo Maryniuk
7eb5f19cb4 Implement test for latest_available 2016-02-24 14:10:07 +01:00
Bo Maryniuk
e372c0b596 Implement test for the info_available 2016-02-24 13:59:05 +01:00
Bo Maryniuk
447771c0fc Add Zypper static data for the available packages 2016-02-24 13:58:47 +01:00
Bo Maryniuk
6989871d27 Implement test for info_installed 2016-02-24 12:31:17 +01:00
Bo Maryniuk
0cc6bce4aa Use strings instead of unicode strings 2016-02-24 11:56:30 +01:00
Bo Maryniuk
3342c03987 Implement list upgrades test 2016-02-24 11:56:18 +01:00
Bo Maryniuk
8862d7af65 Add list upgrades Zypper static data 2016-02-24 11:55:59 +01:00
Bo Maryniuk
4d38d318f4 Implement error handling test for listing upgrades 2016-02-24 11:55:34 +01:00
Bo Maryniuk
53338402a5 Use renamed zypper products data file 2016-02-24 11:21:11 +01:00
Bo Maryniuk
c6135975b0 Rename Zypper products static test data file 2016-02-24 11:20:53 +01:00
justinta89
fd1e2838ea Lint 2016-02-23 19:40:42 -07:00
justinta89
421a112914 Added config_dir to test minion config 2016-02-23 19:40:22 -07:00
justinta89
bf6a4c0983 Fixed lint error 2016-02-23 16:20:06 -07:00
justinta89
3566fbbcca More updates to beacons test 2016-02-23 16:19:07 -07:00
justinta89
37c4bf22d2 Updated beacons integration test 2016-02-23 15:46:21 -07:00
rallytime
1931c61563 Only run this pkg.info_installed test on distros that have that func 2016-02-23 15:22:14 -07:00
Justin Findlay
f671c3bf3b tests.runtests: add minion test runner 2016-02-23 13:47:47 -07:00
rallytime
0488668a00 Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name 
Fixes #31370
 2016-02-23 11:09:36 -07:00
Bo Maryniuk
e87864986d Add Zypper unit test: test_list_products and test_refresh_db 2016-02-23 17:35:48 +01:00
Bo Maryniuk
cd6419fc9c Add Zypper Unit Test installed products sample data 2016-02-23 17:34:37 +01:00
Mike Place
43d531b93d Merge pull request #31392 from vodik/nftables 
Changes to nftables module
 2016-02-23 09:15:01 -07:00
Mike Place
64ed9fcd01 Merge pull request #31418 from terminalmage/fix-debian-grains 
Fix core grains when Debian OS detected as 'Debian GNU/Linux'
 2016-02-23 08:49:49 -07:00
Erik Johnson
5c833efc01 Support running grains tests 2016-02-22 21:55:32 -06:00
Erik Johnson
0e0cd17160 Rename core.py to core_test.py 2016-02-22 21:54:49 -06:00
twangboy
144f7206fe Fix uppercase computer names 2016-02-22 16:42:08 -07:00
Mike Place
873061e2fa Merge pull request #31422 from cachedout/remove_runit_test 
Remove useless test
 2016-02-22 16:28:01 -07:00
Mike Place
56a899c8d9 Remove useless test 
This tests absolutely nothing and has no real point.
 2016-02-22 16:26:30 -07:00
Erik Johnson
d3cd1b596d Add unit test for core grains 2016-02-22 16:37:03 -06:00
Mike Place
2bd9af38b0 Merge pull request #31329 from kraney/boto_iam 
Extend boto_iam with support for managed policies
 2016-02-22 12:28:30 -07:00
justinta89
6db628be1a Basic integration tests for beacons execution module 2016-02-22 11:22:34 -07:00
Mike Place
e1ade05e54 Merge pull request #31355 from rallytime/fix-31330 
Fix orchestrate outputter when retcode is appended to orchestrate run
 2016-02-22 11:13:07 -07:00
Erik Johnson
c7bd13c9c9 Merge pull request #31376 from cro/suse_service2 
Some distros don't have a /lib/systemd
 2016-02-22 12:11:39 -06:00
Mike Place
268180f49b Merge pull request #31386 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-22 10:43:32 -07:00
Kris Raney
04b3a24e78 Update unit tests to reflect changes 2016-02-22 10:58:23 -06:00
Mike Place
105821efc7 Merge pull request #31352 from ticosax/pull-image-on-running 
[dockerng] Pull missing images when calling dockerng.running
 2016-02-22 09:54:10 -07:00
rallytime
8d928ab34a Pylint fix from wierd git behavior 2016-02-22 09:24:13 -07:00
justinta89
3b238c2e68 Started adding beacons execution module tests 2016-02-22 08:53:02 -07:00
C. R. Oldham
f3fec5562e We need one more mocked return from listdir. 2016-02-21 21:55:08 -07:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
 2016-02-21 15:23:24 -07:00
Simon Gomizelj
c0ac0c0096 Fix check_table 
The output of 'nft list tables' has the family included in the output
 2016-02-20 21:32:48 -05:00
rallytime
4baea26c58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/netapi/index.rst
  - salt/modules/win_servermanager.py
  - salt/modules/zypper.py
 2016-02-20 12:27:41 -07:00
Justin Findlay
8623c24335 add integration tests for minion blackout 
Related to #30868.
 2016-02-19 18:04:31 -07:00
rallytime
28763be519 Remove unused import 2016-02-19 09:51:18 -07:00
rallytime
9b52e39e90 Add testcase for state.orchestrate output 2016-02-19 09:14:46 -07:00
Nicolas Delaby
8c86eeb4dc Pull missing images when calling dockerng.running 
fixes #29727
 2016-02-19 15:43:52 +01:00
Ronald van Zantvoort
3110e3424f Additional fixes to test output, unit tests fixes 2016-02-19 13:11:59 +01:00
Nicolas Delaby
a8dc33a5e3 Saltnado provide also get parameters to the context 2016-02-19 09:11:15 +01:00
Mike Place
f0ba9c1eca Merge pull request #31326 from ticosax/2015.8-dockerng-detect-settings-removal 
[dockerng ] Detect settings removal
 2016-02-18 15:02:50 -07:00
Mike Place
3832f9b874 Merge pull request #30979 from dschaller/npm-cache-clean 
Adding NPM cache_cleaned state & module functions
 2016-02-18 14:51:04 -07:00
Mike Place
b40c611d0d Merge pull request #31067 from jfindlay/deprecate_env 
Deprecate env
 2016-02-18 14:42:10 -07:00
Mike Place
02f79dc2b3 Merge pull request #31322 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-18 14:28:02 -07:00
Nicolas Delaby
7bedd86ebe Add detection of removed settings. 
When removing settings from dockerng.running state definition,
changes where ignored as `_compare()` was iterating only over user defined
parameters.

By looping over all available options we are now sure to not miss
removed entries.

Extend definition of expected default values:

 - Some default values are predictable and hardcoded in the VALID_CREATE_OPTS dict.
 - Some default needs to be read from images (`image_path`)
 - Some defaults values are unpredictable (hostname, mac_address)
 we are comparing desired value against value reported by the container
 (`get_default_from_container`).
 2016-02-18 20:23:31 +01:00
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -07:00
rallytime
01aa33ac12 Merge branch '2015.8' into '2016.3' 2016-02-18 11:13:23 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Mike Place
fe316eb3d2 Merge pull request #31265 from terminalmage/issue9272 
Add skip_verify argument to file.managed state
 2016-02-18 10:15:16 -07:00
Mike Place
ce5bc23431 Merge pull request #31289 from jtand/utils_network_tests 
Added some additional unit tests to unit.utils.network
 2016-02-18 09:56:18 -07:00
Mike Place
9281ff5b1f Merge pull request #31307 from LoveIsGrief/salt-27089-new 
[Recreated]Saltcloud virtualbox provider
 2016-02-18 08:56:21 -07:00
Erik Johnson
cf2ce95e61 Update test to reflect new position of contents param 
The addition of the new skip_verify argument to
salt.modules.file.manage_file() means that the position of contents
param in returner.call_args[0] has changed. This commit updates this
test to reflect the new position.

Additionally, a comment has been added to hopefully make failures in
this test easier to grok for people moving forward.
 2016-02-17 20:54:44 -06:00
justinta89
d16b520d79 Fixed lint error 2016-02-17 15:43:03 -07:00
Mike Place
74a8f008f5 Merge pull request #31143 from kraney/boto_apigateway 
Boto apigateway
 2016-02-17 15:17:16 -07:00
justinta89
b3c1fa8de2 Fixed lint errors 2016-02-17 15:01:59 -07:00
Joe Julian
783e9b2e13 Rework tests and fix reverse peering with gluster 3.7 
Reworked the test structure design for the gluster module and state so I
could create a test that mimiced the behavior difference between 3.7 and
prior versions when reverse probing by ip a server that already exists.

Added the additional data given by gluster 3.7 to the output of
glusterfs.list_peers to allow us to compare a requested peering against
a host's aliases.

Fixes #30932
 2016-02-17 13:10:07 -08:00
Ch3LL
da9bca625e pkg.latest epoch test for 2016 2016-02-17 09:51:11 -07:00
rallytime
023ad4635c Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/win_update.py
  - salt/states/win_update.py
 2016-02-17 09:33:08 -07:00
Justin Findlay
a119fa0e66 tests/unit/utils/url_test.py: remove env support 2016-02-16 20:33:23 -07:00
Justin Findlay
4e709ab2be tests/unit/pydsl_test.py: remove env support 2016-02-16 20:33:23 -07:00
Justin Findlay
728f4e6c05 tests/integration/states/compiler.py: remove env support 2016-02-16 20:33:23 -07:00
Mike Place
52a3c9b0c9 Merge pull request #31130 from ticosax/saltnado_pass_get 
Saltnado: provide also get parameters to the context
 2016-02-16 10:18:52 -07:00
Nicolas Delaby
f0a6d2b814 Saltnado provide also get parameters to the context 2016-02-15 10:09:02 +01:00
Derek Schaller
8d7ab01c67 Fixing npm cache cleaned lint errors 2016-02-12 20:35:13 -08:00
Derek Schaller
6c88c43f28 Merging in cachedout's test fixes 2016-02-12 20:09:22 -08:00
Derek Schaller
4a133d5ddc cache_clean should return a mocked value 2016-02-12 19:51:22 -08:00
Mike Place
c5e5af827c Merge pull request #31171 from Ch3LL/megan-20158 
added logic to check for installed package
 2016-02-12 15:10:21 -07:00
Mike Place
a024d3536f Merge pull request #31177 from Ch3LL/test_content_pillars 
add integration test for issue #30934
 2016-02-12 15:09:31 -07:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -07:00
justinta89
d43d24ba6c Added more basic unit tests to unit.utils.network 2016-02-12 13:07:07 -07:00
Ch3LL
9204e3f562 add integration test for issue 30934w 2016-02-12 12:21:50 -07:00
LoveIsGrief
04795b1fd2 Add a little more information to the heavy virtualbox tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 19:50:19 +01:00
Ch3LL
a12e2f566b fix lint error 2016-02-12 11:38:29 -07:00
Ch3LL
a123efd4ef added logic to check for installed package 2016-02-12 11:01:35 -07:00
Mike Place
498dec2e91 Fix tests 2016-02-12 10:56:01 -07:00
LoveIsGrief
6704ad31b4 Remove unused param 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 18:36:33 +01:00
Tarjei Husøy
ceae2a16f8 Support match-sets in iptables module 
Based on work by @l13t in https://github.com/saltstack/salt/pull/29426.

Added tests and fixed incorrect appending of the built rule.

Closes #29423.
 2016-02-12 10:24:50 -07:00
Erik Johnson
23b6c08727 Lint fixes for merge-forward 2016-02-12 10:44:18 -06:00
LoveIsGrief
a944c5d86d Fix python3 pylint error 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 17:41:40 +01:00
Colton Myers
0a7b958ae3 Fix s3 test for new kms_keyid parameter/return 2016-02-12 09:21:49 -07:00
LoveIsGrief
bb6ffa80e2 from ... import ... on top for lint? 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 14:08:45 +01:00
LoveIsGrief
3cd04cbccc Remove unused function 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 12:35:32 +01:00
Derek Schaller
b5815d367e Reset the name to valid package in npm cache_cleaned unit test 2016-02-11 22:22:21 -08:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Derek Schaller
47f8aeee97 Cleaning up npm cache_cleaned unit tests expected response 2016-02-11 20:39:42 -08:00
Derek Schaller
fe56101584 Update unit test to reflect npm ls directory structure 2016-02-11 19:41:08 -08:00
Winston Liu
6006c404bc use itertools instead of zip. 2016-02-11 17:56:28 -08:00
Winston Liu
bc1a6ecec2 import zip from salt.ext.six.moves 2016-02-11 15:18:01 -08:00
justinta89
61e80d7e2f Added more unit tests to unit.utils.network 2016-02-11 15:52:13 -07:00
Winston Liu
b994bcfae5 lint warnings/errors. 2016-02-11 14:24:35 -08:00
Winston Liu
19bbf51a2e resourcepath -> resourcePath for consistency naming. 2016-02-11 13:26:05 -08:00
Mike Place
f24954dde5 Merge pull request #31139 from exowaucka/develop 
Improve %h and %u handling in SSH module
 2016-02-11 14:13:05 -07:00
Mike Place
52f6887124 Lint 2016-02-11 13:52:59 -07:00
Alex Wauck
329b25b3f1 Improved ssh_auth path expansion test 2016-02-11 13:49:15 -06:00
justinta89
cfc7075c44 Lint and test fixes 2016-02-11 11:22:35 -07:00
justinta89
053ae0cae6 Updated tests to work with code deprecations 2016-02-11 11:22:35 -07:00
Mike Place
b831e0a865 Merge pull request #31131 from Ch3LL/megan-20158 
integration test for issue #31014
 2016-02-11 10:33:23 -07:00
Mike Place
a4040da46d Fix bad unit test 2016-02-11 10:31:40 -07:00
Winston Liu
59aaec3b4c fixed lint warnings. 2016-02-11 08:38:29 -08:00
LoveIsGrief
7965eaab3c Attempt to fix more pylint errors and warnings 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-11 16:58:57 +01:00
LoveIsGrief
4eab39e9ca Attempt to fix pylint errors and warnings 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-11 13:56:38 +01:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
Winston Liu
824960503c lint warnings/errors. 2016-02-10 15:05:53 -08:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
Mike Place
c56a819fd8 Merge pull request #31108 from jtand/npm_test_fix 
Changed npm integration test to install request.
 2016-02-10 14:52:02 -07:00
Mike Place
5bf5848e04 Fixup unit test 2016-02-10 14:36:21 -07:00
justinta89
a5eac47b25 Changed npm integration test to install request. 
Later versions of npm were having trouble installing pm2 with the git link.
 2016-02-10 14:31:16 -07:00
Mike Place
de1abae9d1 Merge pull request #31105 from cachedout/lint_30975 
Lint 30975
 2016-02-10 14:11:21 -07:00
Mike Place
446b4c2aff Lint #30975 2016-02-10 14:04:59 -07:00
Winston Liu
7df27fe0c9 Merge branch 'boto_cognitoidentity' into boto_apigateway 2016-02-10 13:00:30 -08:00
Mike Place
2337951152 Merge pull request #31065 from jtand/debian_ip_test_fix 
Updated to debian_ip_test to match with recent changes in #30989
 2016-02-10 13:55:28 -07:00
LoveIsGrief
17735df82d Move risky event into try/except 
It might leave the test env in a dirty state, maybe further tests might fail, but we have the log to trace it back to that

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:53:21 +01:00
Mike Place
7c07d0597b Merge pull request #31094 from kraney/boto_cognitoidentity 
Boto cognitoidentity
 2016-02-10 13:50:04 -07:00
LoveIsGrief
e5f8227e90 Move @skipIf to parent classes 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:37 +01:00
LoveIsGrief
54db49b843 Remove some TODOs 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:37 +01:00
LoveIsGrief
53c7cd87ca When creating a machine return a dict 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
66114293bf Introduce timeout helper 
This should help us stop copy-pasting the calculations to let us timeout functions

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
95ab35203d Redtest to stop and restart a machine multiple times 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
6cfb447cff Introduce profiles for testing 
* virtualbox-deploy-conf won't deploy a script
* virtualbox-minion will do a full deploy with a minion config

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
1a8cd747c5 Feature: deploy salt on machine when creating 
We need to setup the tests with a profile that wants to deploy and use the profile

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
7b4142dff3 Improve output JSON interpretation cleaning for tests 
(Actually also fix it because we we popping increasing random elements from the output... not good)

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
63edda4b50 New function for ip addresses 
Waits on the guest to have one.

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
f56d72b69f Helper functions should do what they are named for 
New helpers also added to describe the state of the machine

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
ef24a16f4e Remove unneeded test 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
7c4b3580f1 Try and stop the running VM as a cleanup 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
1d6b94c279 Starting machines works now too 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
8111dcb092 Force actions in tests 
Otherwise there is always a confirmation prompt... ain't nobody got time fo' dat!

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
59d212acb1 Provider is getting deprecated in the config 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
04c3bae44f Move some common test functions to helpers 
Introduce stop machine test (it's red :( )

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
1b3d96fa9f First test to get network address from already running guest 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
b195d0f1a7 Use dict output for VirtualboxTests 
This should make the output from salt-cloud more verifiable and make tests more reliable

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
13d49278f0 A little PEP8 cleaning 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
b0752a3d82 Implement list_nodes_select 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
3b052215e2 Implement function show_image 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
a1c94bf01b Red-test: list_nodes_full 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
f4386c9be1 Tests and templates for starting and stopping VMs 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
8c7e885537 Improve the output of list_nodes 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
abf139a531 Output the default information expected for list_nodes 
This still needs to be enriched

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
20b574abef Improve XPCOM to dict conversion 
Allow passing tuples of attributes and their default values in case they don't exist in the xpcom object

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
2439d61b02 Improve XPCOM to dict conversion 
We will need this in the future when listing machines and requesting attributes that don't exist (yet)

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
ec50b5ca51 Remove list_available_images 
Following a discussion about it, the function just doesn't apply to virtualbox
virtalbox doesn't have a concept of "templates" so we can't list them

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
f4094ae320 Implement instance destruction 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
38526b2c51 Move virtualbox functions to their own utility module 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
00229e200c List all available images in virtualbox 
Does virtualbox have templates?

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
16f44f425b move vbox to its own function 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
3a27c9bbf6 Check existence without an exception 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
14b5e9b7b9 Test creating a virtual machine with salt-cloud 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
8009f3bc16 Unit tests for xpcomt to dict conversion 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
df789aeeec Use the constants for testing 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
50c36b02da Set default log level to INFO 
Fix log lines

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
459eaa8945 More rigorous setup precautions for tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
2342940f64 Remove unnecessary import 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
98ad2cbe71 Add virtualbox to profile checks 
Virtualbox needs the 'clonefrom' property and it doesn't need size

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
1995b9ad14 PEP8 docstrings 
double quotes instead of single quotes

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
1545c9de7f Setup testing for calls to salt-cloud 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
4a1a6a962f Move around files for clarity and separation 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
b9ec577d11 Add basic configuration for the tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
c4cb16c379 Post-merge organization 2016-02-10 21:38:11 +01:00
LoveIsGrief
c07cd63678 Improve tests 
Test VM creation, destruction and cloning
 2016-02-10 21:37:31 +01:00
LoveIsGrief
ed76f648f6 Create a basic VirtualBoxTestCase with helper assertions 2016-02-10 21:37:31 +01:00
LoveIsGrief
22e5936336 Move out basic virtualbox functions and introduce basic tests 2016-02-10 21:36:45 +01:00