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,068 Commits 24 Branches 182 Tags 341 MiB
1f21dfc555
Commit Graph

4321 Commits

Author SHA1 Message Date
rallytime
1f21dfc555 Fix unit.states.kmod_test to pass when running in Py3 
The join function adds each list item in different orders, resulting
in a failing state comment comparison. This is inaccurate behavior.
 2016-07-11 14:26:06 -06:00
rallytime
6b7a305a1b Rename dockerio.py unit tests to dockerio_test.py 
These tests have never run automatically because of an incorrect file name.

Added a skipIf on these tests as they are currently non-functioning and the
module they're testing has been deprecated.
 2016-07-11 14:26:06 -06:00
rallytime
e6f875cd62 Remove izip import from unit.modules.boto_apigateway_test.py 
Use six compatible version of zip instead
 2016-07-11 14:26:06 -06:00
Mike Place
a733b844be Fixup unit test for archive module 2016-07-11 11:59:00 -06:00
Mike Place
915652165f Merge pull request #34542 from rallytime/stringio-migrations 
Migrate StringIO imports to use the six library for Python2/3 compatibility
 2016-07-08 10:47:04 -06:00
rallytime
c539333924 Use six.moves.StringIO() 2016-07-08 09:30:58 -06:00
rallytime
1f4a75f268 Move StringIO import to use six for tests.unit.modules.zypper_test.py 2016-07-07 19:27:30 -06:00
rallytime
7c216c3a1d Fix the unit.grains.core_test tests to run with Python3 2016-07-07 16:41:21 -06: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
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
Nicole Thomas
3ebba020b6 Rename some unit test files by adding _test (#34503) 
These two test files are currently not running automatically on Jenkins.
Renaming these files will add them to the full runtests.py run.
 2016-07-07 12:05:08 -04:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
 2016-07-06 09:12:25 -06:00
Bo Maryniuk
d1c2d5aaaa Lintfix 2016-07-06 10:09:14 +02:00
Bo Maryniuk
88ab5f4755 Fix Python3 compat (StringIO) 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f1d0961e69 Fix boolean comparison 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f275378e24 Add unit test for update an object 2016-07-06 10:09:14 +02:00
Bo Maryniuk
6174f4ad4a Fix imports 2016-07-06 10:09:14 +02:00
Bo Maryniuk
bf9ba65489 Add unit test for deleting objects 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1ce88be0ef Add unit test for criteria matcher 2016-07-06 10:09:14 +02:00
Bo Maryniuk
a20019d859 Add unit test for "matches" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
844eefd758 Add unit test for "less than" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
fac88ac41b Add unit test for "equals" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1dfe81bfe6 Add unit test for "more than" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
99848659c9 Add unit test on getting objects 2016-07-06 10:09:14 +02:00
Bo Maryniuk
bc1a8b7e45 Accept content in Writer 2016-07-06 10:09:14 +02:00
Bo Maryniuk
c4c2ac7e70 Add object storing unit test 2016-07-06 10:09:14 +02:00
Bo Maryniuk
8e537ccc9e Reset data in Writable 2016-07-06 10:09:14 +02:00
Bo Maryniuk
c744aa1caf Add unit test for database listing 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f7dc2b9c84 Add unit test for object validation 2016-07-06 10:09:14 +02:00
Bo Maryniuk
234e342aa7 Add unit test for object serialization 2016-07-06 10:09:14 +02:00
Bo Maryniuk
0a177297f4 Rename Writable class 2016-07-06 10:09:14 +02:00
Bo Maryniuk
8927d6fef6 Rename "TestEntity" as it accidentally picked by PyTest 2016-07-06 10:09:14 +02:00
Bo Maryniuk
4c7e4d36b7 Fix docstring 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1df6b0a6a9 Add test creating table 2016-07-06 10:09:14 +02:00
Bo Maryniuk
54e5655e11 Add unit test for database close 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f9c40170e5 Add initial tests for fsdb 2016-07-06 10:09:14 +02:00
Bo Maryniuk
eff3f4ef66 Fix broken tests: add os.mkdir mocking 2016-07-06 10:09:14 +02:00
Bo Maryniuk
e85343df9b Add licence to the inspector collector unit test 2016-07-06 10:09:14 +02:00
twangboy
78f7c530bb Remove unit tests, integration tests written 2016-07-05 15:12:34 -06:00
Mike Place
ff83c6d219 Merge pull request #34346 from kraney/boto_sns_topic_absent_state_does_not_remove_associated_subscription_arns 
added an optional parameter into boto_sns absent state to remove all …
 2016-06-30 11:25:57 -07: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
cc83fa151a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
 2016-06-28 17:34:27 -06:00
rallytime
c87a108a12 Don't forget the pylint disables for range 2016-06-28 16:52:37 -06:00
rallytime
359e8ca2ce Pylint fixes 2016-06-28 16:04:47 -06:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
Winston Liu
d4c1463cfa added an optional parameter into boto_sns absent state to remove all subscriptions tied to the topic being removed. 2016-06-28 13:16:53 -07:00
Mike Place
80a659bb51 Merge pull request #34283 from sjorge/2016.3-mount-fstab 
2016.3 mount vfstab support
 2016-06-28 12:23:39 -07:00
Mike Place
4feea285d4 Merge pull request #34248 from anderbubble/bugfix/find-depth 
Correct handling of min/maxdepth during file.find (#34217)
 2016-06-28 12:19:18 -07:00
Alessandro Ghedini
882c6c9c86 Do not force 'filter' table when flushing 
The "table" argument is already part of the function signature, this means
that flush() will always force the "filter" table even when the user sets
a different one.
 2016-06-28 15:40:50 +01:00
Jorge Schrauwen
b8c6948cd5 fixes broken rm_fstab test due to missing __grain__.kernel 2016-06-25 15:42:15 +02:00