valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71,593 Commits 24 Branches 182 Tags 341 MiB
84e2e8b101
Commit Graph

428 Commits

Author SHA1 Message Date
Mike Place
cdfd0161fc Set timeout for run_salt in test suite 2016-07-22 16:14:25 -06:00
twangboy
8f29723160 Fix duplicate import, circular reference 2016-07-20 14:34:58 -07:00
Mike Place
3342b0c664 Merge remote-tracking branch 'twangboy/int_tests_cachedout' into int_tests_interfaces 2016-07-20 10:25:42 -06:00
Mike Place
ec8a6ebab3 Correct config test errors 2016-07-20 10:00:31 -06:00
Mike Place
03039c13e2 Lint 2016-07-20 10:00:31 -06:00
twangboy
4e56d28993 Add tcp_master settings to both masters 2016-07-20 10:00:31 -06:00
twangboy
3833c008b2 Cleans up config parameters 2016-07-20 10:00:30 -06:00
twangboy
003e60f6c6 Add cachedir for minions and syndic 2016-07-20 10:00:30 -06:00
twangboy
68e5620b92 Check actual minion ports 
For some reason this fixed the PYTHONPATH issue
 2016-07-20 10:00:30 -06:00
twangboy
79b5be6989 Add more descriptive report for interactive mode 2016-07-20 10:00:30 -06:00
twangboy
cfc82f4004 Fix lint 2016-07-20 10:00:30 -06:00
twangboy
54647eb7d8 Fix mem leak caused by pki_dir 2016-07-20 10:00:30 -06:00
twangboy
9b14dc0a6e Add Pedro's suggestions 2016-07-20 10:00:30 -06:00
twangboy
9bc438e302 Fix subminion 2016-07-20 10:00:29 -06:00
twangboy
1805630fdc Fix integration tests on windows 2016-07-20 10:00:29 -06:00
twangboy
f7fb4985c4 Add Pedro's suggestions 2016-07-20 10:00:29 -06:00
twangboy
785f5470fc Fix subminion 2016-07-20 10:00:29 -06:00
twangboy
5bcb27e477 Fix integration tests on windows 2016-07-20 10:00:29 -06:00
twangboy
f960ded780 Gate SIGINT in shutdown routines for Windows 
SIGINT not available in Windows
 2016-07-19 13:48:03 -07:00
twangboy
c5245f6b24 Fix stack trace on Jenkins 2016-07-19 10:04:24 -07:00
twangboy
b1014cdefb Add code to kill process in Windows 2016-07-18 13:01:44 -07:00
Mike Place
0452d0a0ec Lint 2016-07-18 06:45:57 -06:00
twangboy
1f6f4b29f0 Add tcp_master settings to both masters 2016-07-13 11:24:33 -06:00
twangboy
82bc69896e Cleans up config parameters 2016-07-13 11:24:33 -06:00
twangboy
2dbd5d4e92 Add cachedir for minions and syndic 2016-07-13 11:24:33 -06:00
twangboy
23193b08e1 Check actual minion ports 
For some reason this fixed the PYTHONPATH issue
 2016-07-13 11:24:33 -06:00
twangboy
4cbb679550 Add more descriptive report for interactive mode 2016-07-13 11:24:33 -06:00
twangboy
66c58ddaf1 Fix lint 2016-07-13 11:24:33 -06:00
twangboy
291f6369a7 Fix mem leak caused by pki_dir 2016-07-13 11:24:33 -06:00
twangboy
f4b3c969d1 Add Pedro's suggestions 2016-07-13 11:24:32 -06:00
twangboy
528d0d2bb5 Fix subminion 2016-07-13 11:24:32 -06:00
twangboy
2636014ccf Fix integration tests on windows 2016-07-13 11:24:32 -06:00
twangboy
c9d435734f Add Pedro's suggestions 2016-07-13 11:24:32 -06:00
twangboy
a28e0782e5 Fix subminion 2016-07-13 11:24:32 -06:00
twangboy
dbd8482eb5 Fix integration tests on windows 2016-07-13 11:24:32 -06:00
Nicole Thomas
357649313a Avoid circular imports when calling salt.utils functions (#34586) 
Also remove unused imports:
  - platform
  - hashlib.md5
  - salt.utils.process.MultiprocessingProcess
  - tornado.concurrent
 2016-07-12 15:13:57 -04:00
Mike Place
28504d19ab Revert "Py3 for integration test" 
This reverts commit cd959c640f.
 2016-06-30 16:25:42 -06:00
Mike Place
cd959c640f Py3 for integration test 2016-06-30 14:17:36 -06:00
Mike Place
51a4f09b93 Match overriden method 2016-06-30 14:16:48 -06:00
Mike Place
b02926f41c Immediate shutdown 2016-06-30 14:16:48 -06:00
Mike Place
5db2e1519f Increase the speed of test suite startup 
Tests now start in ~1s
 2016-06-30 14:16:47 -06:00
Erik Johnson
20ed2c6bcf Remove repr formatting flag in places where it is used solely for quoting (#34183) 
* salt/cloud/__init__.py: remove repr formatting

* salt/cloud/clouds/azurearm.py: remove repr formatting

* salt/cloud/clouds/ec2.py: remove repr formatting

* salt/cloud/clouds/profitbricks.py: remove repr formatting

* salt/loader.py: remove repr formatting

* salt/modules/win_file.py: remove repr formatting

* salt/modules/zypper.py: remove repr formatting

* salt/pillar/consul_pillar.py: remove repr formatting

* salt/renderers/pyobjects.py: remove repr formatting

* salt/returners/sentry_return.py: remove repr formatting

* salt/states/bower.py: remove repr formatting

* salt/states/cabal.py: remove repr formatting

* salt/states/cmd.py: remove repr formatting

* salt/states/composer.py: remove repr formatting

* salt/states/win_network.py: remove repr formatting

* salt/states/eselect.py: remove repr formatting

* salt/states/file.py: remove repr formatting

* salt/states/htpasswd.py: remove repr formatting

* salt/states/memcached.py: remove repr formatting

* salt/states/npm.py: remove repr formatting

* salt/states/pip_state.py: remove repr formatting

* salt/states/pkg.py: remove repr formatting

* salt/states/pkgrepo.py: remove repr formatting

* salt/states/supervisord.py: remove repr formatting

* salt/states/timezone.py: remove repr formatting

* salt/states/virtualenv_mod.py: remove repr formatting

* salt/states/dockerio.py: remove repr formatting

* salt/states/win_system.py: remove repr formatting

* salt/utils/nb_popen.py: remove repr formatting

* salt/utils/cloud.py: remove repr formatting

* Add pylint disable due to legit usage of repr flag

See https://github.com/saltstack/salt-pylint/pull/6

* Fix composer tests

These tests needed to be updated because quoting was changed in the
state module in 9dc9146. There was an unnecessary !r used for the
exception class there, which means that instead of the exception class
being passed through the formatter and coming out with the equivalent
value of err.__str__(), we get a repr'ed instance of the exception class
(i.e.  SaltException('',)) in the state output.

The unit test was asserting that we have that repr'ed instance of
SaltException in the output, a case of writing the test to confirm the
badly-conceived output in the state. This has also been corrected.

* salt/cloud/clouds/azurearm.py: lint fixes

* salt/modules/boto_s3_bucket.py: lint fixes

* salt/modules/minion.py: lint fixes

* salt/modules/reg.py: lint fixes

* salt/modules/testinframod.py: lint fixes

* salt/modules/win_iis.py: lint fixes

* salt/pillar/csvpillar.py: lint fixes

* salt/utils/win_functions.py: lint fixes

* salt/states/nxos.py: lint fixes

* salt/returners/mongo_future_return.py: lint fixes

* tests/integration/__init__.py: lint fixes

* tests/unit/context_test.py: lint fixes

* tests/integration/states/file.py: lint fixes

* tests/integration/utils/test_reactor.py: lint fixes

* tests/integration/utils/testprogram.py: lint fixes

* tests/unit/__init__.py: lint fixes

* tests/integration/shell/minion.py: lint fixes

* tests/unit/modules/boto_apigateway_test.py: lint fixes

* tests/unit/modules/boto_cognitoidentity_test.py: lint fixes

* tests/unit/modules/boto_elasticsearch_domain_test.py: lint fixes

* tests/unit/modules/k8s_test.py: lint fixes

* tests/unit/modules/reg_win_test.py: lint fixes

* tests/unit/states/boto_apigateway_test.py: lint fixes

* tests/unit/states/boto_cognitoidentity_test.py: lint fixes

* tests/unit/states/boto_elasticsearch_domain_test.py: lint fixes
 2016-06-29 16:30:18 -04:00
rallytime
9220ea0729 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/minion.py
  - salt/modules/mac_brew.py
  - salt/modules/pkgng.py
  - salt/states/apache_module.py
  - salt/states/ini_manage.py
  - salt/states/win_servermanager.py
 2016-06-02 10:13:34 -04:00
Justin Findlay
8295b48459 test.integration: use hard /tmp on MacOS 
Otherwise, the tests will not work as `$TMPDIR` produces a path that is
too long for unix sockets on the platform.
 2016-05-31 13:27:50 -06:00
Pedro Algarvio
e1587261c9
The scripts directory is now a subdirectory of TMP so it gets cleaned up. 2016-05-23 18:04:47 +01:00
Pedro Algarvio
580271d966
First get a new port, then close the offending. 2016-05-23 16:33:29 +01:00
Pedro Algarvio
15b0a399cb
If psutil is available, make sure we kill all process children 2016-05-23 15:40:50 +01:00
Pedro Algarvio
320dc0b606
Turn subprocesses logging proxying back on. 
Make sure none of the hard coded ports are used when grabbing an unused port
 2016-05-23 13:57:22 +01:00
Pedro Algarvio
d2b696ba8b
We don't currently support colors on windows 2016-05-23 13:57:22 +01:00
Pedro Algarvio
3a755208f4
Var typo 2016-05-23 13:57:22 +01:00