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,118 Commits 24 Branches 182 Tags 341 MiB
291f6369a7
Commit Graph

2713 Commits

Author SHA1 Message Date
twangboy
291f6369a7 Fix mem leak caused by pki_dir 2016-07-13 11:24:33 -06:00
twangboy
7030c925cc Make additional changes to master configs 2016-07-13 11:24:33 -06:00
twangboy
05629c8efb Fix master and sub_minion configs 2016-07-13 11:24:32 -06:00
twangboy
074fd4a8be Fix configs, remove default values 2016-07-13 11:24:32 -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
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
 2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
rallytime
3026df346f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-12 13:27:16 -06:00
Justin Anderson
57df38e685 Update github IP for ssh state integration tests (#34592) 2016-07-12 15:17:41 -04: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
Nicole Thomas
efc2ab9d68 [2016.3] Avoid salt.utils circular imports when using "from" (#34585) 
Also removes an unused import
 2016-07-12 15:13:26 -04:00
Nicole Thomas
2e1007254b Avoid circular imports when calling salt.utils functions (#34584) 2016-07-12 13:41:30 -04:00
rallytime
815c8b38d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-08 10:34:32 -06:00
Mike Place
6b8c76af83 Prevent many errors in the test suite in loader tests (#34521) 
Pack in what the loader needs.
 2016-07-07 17:03:45 -04:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
Mike Place
685df80929 Merge pull request #34518 from terminalmage/fix-pkg.latest-test 
Fix pkg.latest integration test for non-LTS ubuntu
 2016-07-07 13:29:13 -06:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
Erik Johnson
4aef44ecdf Fix pkg.latest integration test for non-LTS ubuntu 
This test uses ``pkg.list_upgrades`` to find a package which it assumes is
installed, to test ``pkg.installed`` with ``only_upgrade=True``. The
problem with that approach is that ``pkg.list_upgrades`` uses a dry-run
of an ``apt-get dist-upgrade`` to find the upgrades. On non-LTS Ubuntu
releases, a ``dist-upgrade`` results in upgrading to an entirely new
Ubuntu release, and new packages which would be installed by the
dist-upgrade (but are not currently installed) will be included in the
return data. This causes the test to fail when we attempt to run
``pkg.latest`` with ``only_upgrade=True`` on a package which is not
already installed.

This commit fixes the test by ensuring that our target package is
already installed, and continuing to iterate through the return data
from ``pkg.list_upgrades`` until a currently-installed package is found.
 2016-07-07 12:51:01 -05:00
Mike Place
4c75d4f92b Integration test for grains data in templatized files (#34487) 
Refs #34433
 2016-07-07 12:16:35 -04:00
Justin Anderson
75299456be Use skipTest for network state integration test (#34489) 
* Updated skipTest to check for debian or redhat

* Removed skipIf import
 2016-07-06 13:43:09 -04:00
Justin Anderson
0460edb9e2 Arch linux does not have osrelease or osmajorrelease grains (#34453) 2016-07-05 15:34:41 -04:00
rallytime
e4a8c585d0 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-07-05 13:11:32 -06:00
Mike Place
325be594ec Merge pull request #34380 from richardscollin/system-date-module-change-interface 
System date module change interface
 2016-07-05 12:10:42 -06:00
rallytime
91120dba01 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-05 09:58:52 -06:00
rallytime
55a91e22be Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-05 09:13:50 -06:00
Mike Place
0e2c71a537 Backport change to integraiton test suite 
Will avoid lint errors in earlier branches. Thanks to @terminalmage for pointing out my error.
 2016-07-01 16:10:34 -06:00
Mike Place
28504d19ab Revert "Py3 for integration test" 
This reverts commit cd959c640f.
 2016-06-30 16:25:42 -06:00
rallytime
8398de0baf Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-30 16:08:57 -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
Collin Richards
9d14d130fa Fix pylint issues 2016-06-30 10:46:35 -05:00
Mike Place
45b8fb10d7 Merge pull request #34373 from jtand/network_state_integration_test 
Network state integration test
 2016-06-30 08:05:44 -07:00
Erik Johnson
d6af1de0b7 Optimize pkg integration tests and add a couple new tests (#34377) 
* Remove redundant usage of destructiveTest decorator

* Remove unnecessary SLS file

This simple state can be run using run_state

* Explicitly order tests

* Use run_state instead of invoking state.sls

* Ensure only one refresh_db done during pkg integration tests

* Add pkg.latest test for package without an epoch

* Optimize pkg.latest_version usage in pkg integration tests

* Clarify outcome when only_upgrade is used

* Add pkg.latest test with only_upgrade=True
 2016-06-30 10:48:22 -04:00
Collin Richards
72d47a67c0 Modify interface from utc boolean to utc_offset 
The system set/get date/time functions now have
a utc_offset instead of a utc boolean so the time
can be set based off of any timezone.
 2016-06-29 18:25:26 -05:00
Collin Richards
0866ee850e Remove _linux_set_datetime backend 
Instead only use the date program as the backend.  This is much more
portable.
 2016-06-29 18:24:50 -05:00
Collin Richards
69f8dd96ae Remove posix arguments 2016-06-29 18:24:49 -05:00
rallytime
3149da1bcc Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-29 16:16:46 -06:00
rallytime
e8b7c0654b Be more explicit with salt.utils imports and usage 2016-06-29 15:59:42 -06:00
Justin Anderson
1d24053e36 network.system sls file 2016-06-29 14:31:46 -06:00
Justin Anderson
4a9e6af542 network.routes sls file 2016-06-29 14:31:07 -06:00
Justin Anderson
76c90b2ef6 network.managed sls file 2016-06-29 14:30:23 -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
Justin Anderson
84a36369fa Added network state integration test 2016-06-29 14:28:36 -06:00