valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,844 Commits 24 Branches 182 Tags 341 MiB
3881b6e0f3
Commit Graph

701 Commits

Author SHA1 Message Date
Justin Anderson
34bcf9ccfc Changed network state test to use test=True 2016-07-12 12:40:40 -06:00
Justin Anderson
b2616833b0 Some small changes 2016-07-11 14:35:25 -06:00
rallytime
815c8b38d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-08 10:34:32 -06:00
Ch3LL
c5035118bf add skip_verify option to archive.extracted 2016-07-07 14:42:27 -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
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
Justin Anderson
ed59113e94 Change network state integration test to use test=True 2016-07-07 12:27:18 -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
rallytime
e4a8c585d0 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-07-05 13:11:32 -06:00
rallytime
8398de0baf Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-30 16:08:57 -06: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
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
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
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
Erik Johnson
b793426c23 Remove unnecessarily-disabled sanity check (#34325) 
This was commented out for reasons having nothing to do with anything
else going on in 0c069dd. Uncommenting this sanity check so that we are
notified if we need to update our targets in the future.
 2016-06-28 11:12:55 -04:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
 2016-06-09 13:06:10 -06:00
rallytime
c5b4ec0b0f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/groupadd.py
  - salt/states/service.py
 2016-06-08 11:20:18 -06:00
Mike Place
1db559afe9 Merge pull request #33805 from jfindlay/pkg_tests 
states.pkg int tests: skip if pkg mgr unavailable
 2016-06-07 07:40:46 -07:00
Justin Findlay
f13f914755 states.service: add integration tests 2016-06-06 23:11:49 -06:00
Justin Findlay
0c069ddc95 states.pkg int tests: skip if pkg mgr unavailable 2016-06-06 17:44:43 -06:00
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
rallytime
b1e505f80e Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.5.11.rst
  - doc/topics/releases/2015.8.9.rst
  - salt/cloud/clouds/nova.py
  - salt/minion.py
 2016-05-13 09:47:46 -06:00
rallytime
679200aeb2 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/scripts.py
 2016-05-12 16:52:27 -06:00
Nicole Thomas
730bec1eef [2015.8] Merge forward from 2015.5 to 2015.8 (#33207) 
* Fix file.managed for Windows (#33181)

* Revert back to import string_types

For some reason, there is a problem with the following
code when run from the file.py module:
```
from salt.ext import six
comment = 'This is a string'
isinstance(comment, six.string_types)
```
When run from within the python shell it works fine.

* Add six import

* Fix some lint

* Use correct six import

* Changed it back to explicit import

* Additional comments specific to 2015.5

* Fix file.managed for real

* Move comment to clarify purpose

* update 2015.5.11 release notes (#33197)

* Add pip installed and removed test (#33178)

* Resolve issue with pkg module on Mint Linux (#33205)

Closes #32198
 2016-05-12 13:54:47 -07:00
Justin Anderson
a09e1b6335 Add pip installed and removed test (#33178) 2016-05-12 08:31:41 -07:00
Nicole Thomas
b6cf601722 Merge pull request #33103 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-05-09 13:24:25 -06:00
Jεan Sacren
479e643b62 Develop 2016 0509 0030 (#33111) 
* Disallow negative value for fib number

Fibonacci number is supposed to be nonnegative. Add this new feature to
disallow negative value to be passed in for fib number.

* Minimize code duplication

* Use /etc/adjtime for Gentoo

* Add integration test for timezone module
 2016-05-09 10:06:44 -07:00
rallytime
ced033c0a4 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2016.3.0.rst
  - salt/scripts.py
  - salt/states/glusterfs.py
 2016-05-06 16:05:58 -06:00
rallytime
180c03ca24 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/states/boto_elb.py
  - tests/integration/states/user.py
  - tests/unit/states/file_test.py
 2016-05-06 09:20:05 -06:00
Megan Wilhite
2c6326f14a fix tests for file.blockplace to remove newline (#33082) 2016-05-06 08:44:20 -06:00
Mike Place
e9c94a4141 Skip Unicode test if the system does not have a filesystem encoding set (#33057) 
In the case where a user does not have the LANG env set,
Python can't figure out how to encode Unicode during a popen call.

I could not find any combination of tricks, including setting the encoding
or the locale or the environment variable itself in the call to popen that
would mitigate this issue. This may well be a bug in the Python stdlib itself.
 2016-05-05 07:06:07 -07:00
Nicole Thomas
111701c8bb [2015.8] Merge forward from 2015.5 to 2015.8 (#33054) 
* Add run_on_start docs to schedule.rst (#32958)

Fixes #22580

* Backport #33021 manually to 2015.5 (#33044)

* Saltfile with pillar tests (#33045)

* add file.managed with pillar data tests

* do not require git for other tests

* Whitespace...
 2016-05-05 07:05:55 -07:00
Justin Anderson
1066063a19 File and User test fixes for 2015.8 on Fedora23 (#33056) 
* Fix failing user present test

* Fix file_test.test_symlink failure on 2015.8
 2016-05-05 07:05:10 -07:00
Justin Anderson
6d3e4e8935 File and User test fixes for 2015.5 on Fedora23 (#33055) 
* Fix file_test.test_symlink on 2015.5

* Fix failing user present test
 2016-05-05 07:00:59 -07:00
Megan Wilhite
f8757631b2 Saltfile with pillar tests (#33045) 
* add file.managed with pillar data tests

* do not require git for other tests
 2016-05-04 14:37:57 -06:00
rallytime
16c9ce70ad Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-05-02 12:58:24 -06:00
Justin Findlay
cc854f1464 update pip state and integration tests for newer pip versions (#32905) 
* modules.virtualenv_mod: use correct pip bootstrap url

* modules.pip: raise error on mirrors arg

* states.pip: run mirrors test on < 7.0.0

* update pip integration test states to not use mirrors

* modules.pip: run mirrors tests on pip < 7.0.0
 2016-04-29 10:49:29 -07:00
Megan Wilhite
c57a2b8f3b Fix user present tests (#32895) 
* fix user present tests for mac

* add setup and teardown methods

* add destructive and root decorators

* forgot teardown decorators

* fix pylint
 2016-04-29 10:40:54 -06:00
rallytime
5952e3e300 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/mac_brew.py
  - salt/states/archive.py
 2016-04-28 15:35:34 -06:00
Ch3LL
3520d496ba add /Users directory for mac minion in user present test 2016-04-26 15:32:11 -06:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
 2016-04-26 14:42:26 -06:00
Kai Howelmeyer
20c2cf176b Add max_depth parameter to file.directory, fixes #31989 (#32463) 2016-04-22 10:11:58 -06:00
Knut Auvor Grythe
d432e4b990 Add support for unicode in all GECOS fields (#32630) 
* Add support for unicode in all GECOS fields

* Stop exposing sdecode from salt.modules.useradd

* Slight rephrase of comment

* Fix lint errors
 2016-04-18 08:56:40 -06:00
rallytime
093d833ff1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - pkg/osx/build.sh
 2016-04-05 15:38:58 -06:00
Justin Anderson
c6a1d8b7ba Changed /tmp/ to /home/ user.present test 2016-03-31 15:13:58 -06:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
 2016-03-28 11:16:22 -06:00
Justin Anderson
a0d1f42337 Lint fix 2016-03-24 16:33:18 -06:00
Justin Anderson
291a5695d3 Arch does not have the alternatives directory 2016-03-24 16:12:01 -06:00
rallytime
55544a84a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-03-23 11:04:42 -06:00
Justin Anderson
e86797731a Removed some unused imports for lint fixes 2016-03-22 09:15:20 -06:00
Andreas Lutro
e9fe661e72 add integration test for alternatives state 
the alternatives state module has been through some contradictory
changes recently. an integration test should help validate that it
actually works.
 2016-03-21 17:53:01 +01:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
 2016-03-18 10:57:15 -06: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
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
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
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
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -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
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
 2016-02-25 16:21:15 -07:00
Ch3LL
29a53f4353 rename methods in pkg states test 2016-02-26 06:54:01 +09: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
Ch3LL
a387d175d8 integartion test- ensure decorator only runs on one method and not entire class 2016-02-25 01:55:35 +09: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
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
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -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
Ch3LL
da9bca625e pkg.latest epoch test for 2016 2016-02-17 09:51:11 -07:00
Justin Findlay
728f4e6c05 tests/integration/states/compiler.py: remove env support 2016-02-16 20:33:23 -07: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
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
Ch3LL
9204e3f562 add integration test for issue 30934w 2016-02-12 12:21:50 -07: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
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
Mike Place
b831e0a865 Merge pull request #31131 from Ch3LL/megan-20158 
integration test for issue #31014
 2016-02-11 10:33:23 -07:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07: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
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
Colton Myers
67e17b3022 Revert "Deprecated code removed. " 2016-02-10 11:40:48 -07:00
justinta89
56efb2d06a File state born deprecations. 
Backport of #30988
 2016-02-08 10:13:15 -07:00
abednarik
b20738a5a1 File state born deprecations. 
Removed all Boron warning and deprecated code.
 2016-02-08 10:01:28 -03:00
Derek Schaller
de154d76ce Adding npm cache_cleaned state and required module functions 2016-02-06 15:27:00 -08:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Colton Myers
117fb205de Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    tests/unit/modules/boto_vpc_test.py
 2016-01-21 14:37:32 -07:00
Justin Findlay
66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ 2016-01-21 10:55:37 -07:00
justinta89
64a62662ef Added sys import 2015-11-19 14:42:15 -07:00
Justin Findlay
401e4bfd33 file state: integration test difflib version check 2015-11-19 14:10:29 -07:00
justinta89
f947e1e549 Adjusted the expected output to match the actual results 2015-11-19 11:32:18 -07:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
Jonathan Ballet
6d95cbc998 Fix lint errors 2015-10-07 17:49:07 +02:00
Jonathan Ballet
4ff9f4be2a Fix file.directory with clean=true and require_in with states ID 
In order to know which files need to be cleaned up, a file.directory state
looks at its requirements.
Previously, it only looked at the name attribute of the required state and
supposed it was the name of the file to keep within this directory. It's
not completely right, as a requirement can also be made against a state ID,
in which case the 'name' attribute of the required state then have to be
used.

Fix #8646
 2015-10-07 14:53:04 +02:00
Jonathan Ballet
0d391275de Test cases to demonstrate bug #8646 2015-10-07 12:06:35 +02:00
Matti Niemenmaa
8eb5036f1f states.file: allow prepending to non-existent file (#27401) 
Remove the redundant file.touch invocation also from file.append, to
simplify the flow.
 2015-09-27 09:06:51 +03:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Erik Johnson
37c8852584 Update git.config_set tests to use new state name 2015-09-02 20:58:06 -05:00
Erik Johnson
b401328558 tests/integration/states/ssh.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
8053d1f952 tests/integration/states/mysql.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Andreas Lutro
2f55d60293 git.latest: add test for no rev 
technically, rename existing test and add a new simpler test with the
old name.
 2015-08-18 16:38:24 +02:00
Colton Myers
f3c8ba85dc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/modules/systemd.py
    salt/utils/aws.py
 2015-08-17 17:06:59 -06:00
Mike Place
35d6ae2be7 Use with 2015-08-12 12:14:12 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Thomas S Hatch
2ddf5c4e58 lint 2015-08-08 20:17:45 -06:00
Thomas S Hatch
912d6041f5 apply @cachedout's tests 2015-08-08 09:37:16 -06:00
Mike Place
bbc6f84c75 Merge pull request #26105 from cachedout/fix_25221 
Fix failing test
 2015-08-07 12:11:10 -06:00
Mike Place
1a18013330 Fix failing test 2015-08-07 12:10:40 -06:00
Mike Place
c5e1f5bee6 Merge pull request #25221 from jet9/istextfile_utf8 
Extend salt.utils.istextfile() with detection of utf-8 content instead of binary
 2015-08-07 12:10:27 -06:00
Andreas Lutro
ceda2b7274 users: integration test for empty GECOS fields 2015-08-07 09:25:21 +02:00
Dmitry Kurbatov
2a349ff102 Extend salt.utils.istextfile() with utf-8 instead of binary detection 2015-08-07 10:06:20 +03:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Jason Hamner
24f653e963 Integration Test for Issue 25250 
Adds integration test for #25250
 2015-07-24 13:28:15 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
Pedro Algarvio
c4b15840c6 Additional test case for question raised in #1846 
https://github.com/saltstack/salt/issues/1864#issuecomment-102246258
 2015-07-15 14:29:43 +01:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Justin Findlay
6f238e924c integration test file.managed sources 2015-06-30 14:26:59 -06:00
Doug Luce
6fe47ea1f4 Allow URL specification of NPM packages 
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError.  Assume that not every package installed globally is
specified with a URL.

Example failing state:

kvsio:
  npm.installed:
      - name: git+ssh://github.com/dougluce/kvs.io.git
 2015-05-26 13:19:17 -07:00
Justin Findlay
f58f3dac1d integration test for char escaping in file paths 2015-05-04 23:24:45 -06:00
Colton Myers
313c46501d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/auth/pam.py
    salt/modules/boto_route53.py
    salt/state.py
 2015-04-24 10:19:03 -06:00
Colton Myers
63119f9505 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/modules/dockerio.py
    salt/modules/localemod.py
    salt/modules/useradd.py
 2015-04-22 10:51:49 -06:00
Thomas S Hatch
a178d444b8 Merge pull request #22946 from s0undt3ch/2014.7 
Test with a more recent pip version to avoid a traceback
 2015-04-22 10:25:17 -06:00
Pedro Algarvio
bc87749e2c Test with a more recent pip version to avoid a traceback 
```
07:39:05,449 [salt.minion                                :1178][ERROR   ] A command in 'pip.list' had a problem: Traceback (most recent call last):
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/bin/pip", line 9, in <module>
    load_entry_point('pip==1.3.1', 'console_scripts', 'pip')()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 546, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2666, in load_entry_point
    return ep.load()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2339, in load
    return self.resolve()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2345, in resolve
    module = __import__(self.module_name, fromlist=['__name__'], level=0)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/__init__.py", line 13, in <module>
    from pip.commands import commands, get_similar_commands, get_summaries
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/__init__.py", line 6, in <module>
    from pip.commands.bundle import BundleCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/bundle.py", line 5, in <module>
    from pip.commands.install import InstallCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/install.py", line 5, in <module>
    from pip.req import InstallRequirement, RequirementSet, parse_requirements
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/__init__.py", line 3, in <module>
    from .req_install import InstallRequirement
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/req_install.py", line 20, in <module>
    import pip.wheel
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/wheel.py", line 23, in <module>
    from pip.exceptions import InvalidWheelFilename, UnsupportedWheel
ImportError: cannot import name InvalidWheelFilename
```
 2015-04-22 16:13:58 +01:00
Viet Hung Nguyen
b13db32fde add test for #18843 2015-04-22 16:21:23 +07:00
rallytime
1e4b93dec9 Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Thomas S Hatch
586b81b33e Add tests for the jinja demands 2015-04-15 16:39:08 -06:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Justin Findlay
56364ff571 adding cmd.run state integration tests 2015-04-06 20:32:22 -06:00
Pedro Algarvio
ff4aa5b989 Include unless in the state internal keywords. 
Fixes #22359
 2015-04-05 01:00:08 +01:00
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05:00
Colton Myers
8c1fa5358e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/debian_ip.py
	salt/modules/file.py
	salt/states/ssh_auth.py
	salt/utils/cloud.py
 2015-03-09 11:50:21 -06:00
Viet Hung Nguyen
2a845989b7 bugfix: fix test mode in ssh_known_hosts 
- present func: should not require key/fingerprint.
  In normal mode, key AND fingerprint can be omitted but
  test mode requires them, so fix the test mode to behave same
  way.
- absent function: return correct ret when change suppose to be made.
- refactor a bit.
 2015-03-07 00:58:32 +07:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
Pedro Algarvio
ff636249f4 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
6b0c88e3bf Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
79be964dc2 We need to write something, even an empty string 2015-01-30 22:25:19 +00:00
Pedro Algarvio
b791dd6971 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
fdc467b587 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
f59d669a58 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
4eadb88bfa Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0577610258 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Colton Myers
c4da7bdd64 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/client/mixins.py
	salt/daemons/flo/__init__.py
 2015-01-26 19:44:59 -07:00
Mike Place
09d3d62174 Loosen test constraint and update runas arg 2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5 Even MORE test fixing 2015-01-24 03:16:50 +00:00
Mike Place
7222d741de Even more pip test fixing 2015-01-24 03:16:50 +00:00
rallytime
69d7a6ebd0 Pylint fixes for the 2015.2 branch 2015-01-23 10:57:18 -07:00
Mathias Gug
4670988a68 Fix style. 2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3 Fix style. 2015-01-22 14:40:58 -07:00
Mathias Gug
dd097b730d Fix style issues. 2015-01-22 14:40:49 -07:00
Mathias Gug
4542072c4e Add boto_sns module and state. 
Include integration tests.
 2015-01-22 14:40:32 -07:00
Mathias Gug
f4c75375f4 Make sure boto_sns state is idempotent. 2015-01-22 12:13:33 -08:00
Mathias Gug
85ec021a73 Merge remote-tracking branch 'upstream/develop' into support-sns-subscriptions 
Conflicts:
	tests/integration/states/boto_sns.py
 2015-01-22 11:11:51 -08:00
Mathias Gug
b79756bdd5 Support subscriptions in sns topic state. 2015-01-22 11:04:31 -08:00
Pedro Algarvio
8dbb7394b2 White-space lint fix 2015-01-21 14:17:03 +00:00
Thomas S Hatch
fab600add9 Merge pull request #19746 from lyft/add-boto-sns-module 
Add boto_sns module and state.
 2015-01-16 16:58:09 -07:00
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08:00
Mathias Gug
64cf74ebaa Fix style. 2015-01-14 16:05:36 -08:00
Mathias Gug
6ffc9f827e Fix style. 2015-01-14 16:04:25 -08:00
Mathias Gug
e5ab359bdd Fix style issues. 2015-01-14 16:02:50 -08:00
Mathias Gug
6f9fbe23d6 Add boto_sns module and state. 
Include integration tests.
 2015-01-14 15:43:06 -08:00
Mike Place
fc9a647a3b Remove assert: 2015-01-12 18:53:56 -07:00
Mike Place
cba0d6d597 Fix tests 2015-01-12 16:01:10 -07:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2 
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
 2015-01-11 22:40:16 +00:00
rallytime
d6b3f69c19 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 13:10:09 -07:00
rallytime
28cb062697 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 10:52:55 -07:00
Mike Place
ca9a871d43 Merge pull request #19536 from rallytime/pip_test_fix 
Don't run weird pip install test on CentOS 5
 2015-01-08 12:21:08 -07:00
rallytime
71ef3f7744 Keep package name the same 2015-01-08 12:13:26 -07:00
rallytime
a0f801f475 Skip this test when we are running on centOS 5 2015-01-08 12:11:51 -07:00
rallytime
5490530504 Change the install package to fix pip tests 2015-01-08 09:32:53 -07:00
rallytime
4e87557748 --local is not available in older versions of git 
Also adjust the tests:
    subprocess.check_output is only available in python 2.7
 2015-01-07 11:56:43 -07:00
rallytime
fe4fd7a5a3 Use skip_if_binaries_missing decorator 2015-01-07 10:11:26 -07:00
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
 2015-01-06 13:14:27 -07:00
rallytime
f6243f0b80 Fix the test in the correct place... 2015-01-05 15:36:45 -07:00
rallytime
4a62c2b860 Fix pip state test failure 2015-01-05 15:20:18 -07:00
Mike Place
7ff6c22b9b Remove deprecated tests 2014-12-19 11:37:56 -07:00
Colton Myers
43df12b6cc Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/client/ssh/shell.py
	salt/modules/file.py
	tests/integration/states/file.py
 2014-12-18 10:32:19 -07:00
Elias Probst
a2e52dd5fc Fix tests for #18841. 2014-12-18 01:51:08 +01:00
Elias Probst
6363aa22ac Add integration tests for 'modules.file.replace()'. 2014-12-17 12:06:58 +01:00
Pedro Algarvio
bfe99dbb3f Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	salt/runners/manage.py
 2014-11-26 20:14:56 +00:00
Pedro Algarvio
89befb8827 Switch open() for salt.utils.fopen() 2014-11-26 18:02:24 +00:00
Pedro Algarvio
b5cda75a8c Switch open() for salt.utils.fopen() 2014-11-26 18:01:35 +00:00
Pedro Algarvio
ea717d2422 Switch open() for salt.utils.fopen() 2014-11-26 17:59:52 +00:00
Thomas S Hatch
873d1c1803 Merge pull request #18221 from multani/fix/git-config-set-shell-escape 
Fix Git's config set with values containing white spaces.
 2014-11-18 17:14:43 -07:00
Jonathan Ballet
38bb70d398 Fix Git's config set with values containing white spaces. 
The Salt function 'git.config_set' and the state 'git.config' (which relies
on the former) don't escape the value to be set in the configuration file
passed by Salt. For example, this doesn't work:

  mylocalrepo:
    git.config:
      - name: user.name
      - value: "Jonathan Ballet"
      - repo: file://my/path/to/repo

This set the 'user.name' configuration value to "Jonathan" only.
(Additionally, the state discovers that the value set is not the one
specified, and keeps trying to set the right value, which ends up with lot
of "name = Jonathan" into the "[user]" section of Git's config file.)

This commit fixes the problem and adds some unit tests to verify it's
working properly.
 2014-11-18 20:02:24 +01:00
Mike Place
c1c9245e89 Fixup test failures 2014-10-28 11:29:59 -06:00
Mike Place
e18190bc04 remove sed test 2014-10-27 18:22:18 -06:00
Erik Johnson
ff6a228746 Remove reference to nonexistant function in pkg tests 
This fixes a ref that was missed in 7984a8c.
 2014-08-27 13:52:36 -05:00
Seth House
11f4e20bd8 Fix incorrect call to state.single in npm pkgs test 2014-08-11 11:03:00 -04:00
Seth House
ed4bb5119e Added pkgs support to the npm module/state 2014-08-07 12:36:39 -04:00
rallytime
6be33dcdc9 Change install package to help Arch tests pass 2014-08-05 14:35:32 -06:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
C. R. Oldham
f53e477735 Merge commit, resolve conflict 2014-07-25 11:16:22 -06:00
C. R. Oldham
c94808689d Extend dot-in-pkg test to RHEL 5 as well 2014-07-25 10:57:18 -06:00
Thomas S Hatch
288e9bba29 TABS?!?!? Really @cro ?? 2014-07-25 10:39:19 -06:00
C. R. Oldham
b6f70ac80f Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:09:52 -04:00
Erik Johnson
2939eaec15 Clean up filehandle usage in file state tests 
This does a few things:

1. Change calls to open() to use salt.utils.fopen()

2. Use with blocks where applicable
 2014-07-14 21:23:06 -05:00
Erik Johnson
f847bae5a2 Add tests for templating local files 2014-07-14 21:23:06 -05:00
Mike Place
a08849c270 Remove old-style env= tests. 2014-07-14 11:03:03 -06:00
Pedro Algarvio
5283fa661e Adapt tests to behaviour introduced in #13333 2014-06-10 03:00:19 +01:00
Pedro Algarvio
0b6776ad81 Maintain old test behaviour(no new lines added) 2014-06-10 02:32:22 +01:00
Pedro Algarvio
df3e06ddd7 Test needs root perms 2014-06-10 01:56:24 +01:00
Pedro Algarvio
c6aa49c325 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:26:40 +01:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
Thomas S Hatch
b20462ad3f Merge pull request #13037 from terminalmage/npm-test 
add test for npm.installed/removed
 2014-05-27 10:11:27 -06:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Erik Johnson
da0546c6f4 add test for npm.installed/removed 2014-05-26 06:19:49 -05:00
Pedro Algarvio
5a8575dbb9 The helper method is now released 2014-05-20 10:53:47 +01:00
Pedro Algarvio
e096df9016 Replace string substitution with string formatting 2014-05-01 13:29:38 +01:00
Erik Johnson
b78e558296 Remove unnecessary except 2014-04-25 18:00:04 -05:00
Erik Johnson
cb81b69abc Fix import 2014-04-25 17:58:41 -05:00
Erik Johnson
bffb9b5d43 Add skipIf and destructiveTest 
These tests must be run as root, and create and destroy a user and
group, so this adds the proper decorators.

Additionally, this wraps the assertions from these tests in a try/except
block that ensures that the temp directory created for this test is
cleaned up.
 2014-04-25 17:17:34 -05:00
Erik Johnson
d9fa7c5203 Use new decorators for issue 12209 tests 2014-04-25 17:17:34 -05:00
Erik Johnson
8574d9a19e Use custom user/group for integration tests for #12209 
Not all platforms have a "nobody" user, this commit changes these tests
to use a "test12209" user/group for these tests.
 2014-04-25 17:17:34 -05:00
Erik Johnson
f73a193c6b Add tests for #12209 2014-04-25 17:17:33 -05:00
Erik Johnson
ad53983a16 Fix refs to with_system_account decorator 
This renames this decorator to with_system_user, to go along with
changes in https://github.com/saltstack/salt-testing/pull/14.
 2014-04-25 14:03:41 -05:00
Mike Place
637c372aae Fix bug with mod_watch in supervisor modules 
* Also adds __virtual__ support to supervisord exec module

* Closes #6692

Remove uneeded module.

Don't run supervisord tests without supervisord

Fix state test.

Pulled in an old pylint breakage.

Conflicts:
	salt/modules/saltutil.py
 2014-04-23 16:14:12 -06:00
Mike Place
9ac6e8e150 Remove test. 
Also pass makedirs correctly.
 2014-04-21 10:30:27 -06:00
Mike Place
f717aa6004 Write test for ownership of file.managed with makedirs=True 2014-04-17 15:36:08 -06:00
Thomas S Hatch
09769d6fa2 lint tests 2014-04-02 11:16:24 -06:00
Pedro Algarvio
6f1337b4c8 Remove extra white-space 2014-03-29 13:20:47 +00:00
Pedro Algarvio
596b38e494 Provide env to templates. 
Map `env` to the same value of `saltenv` in the templating context until
`env` is fully deprecated in favor of `saltenv`.

Fixes #11480.
 2014-03-29 13:03:36 +00:00
Thomas S Hatch
43de620730 Merge pull request #11413 from s0undt3ch/hotfix/immutable-lists-sum 
Simpler immutable types
 2014-03-21 11:40:09 -06:00
C. R. Oldham
6c60f17751 Add two tests for checking file permissions when file is already existing 2014-03-17 14:25:17 -06:00
Erik Johnson
37bf8ee768 Change package used for opensuse integration pkg tests 2014-03-14 11:50:32 -05:00
Colton Myers
ea800935d7 Switch git clones to saltstack/salt-test-repo (super small repo) 
Was previously cloning bootstrap a few times, and our salt repo once
(which is a large repo).  Should speed up the git tests substantially.
 2014-03-14 09:45:17 -06:00
Pedro Algarvio
2f3d7bd6cc Merge branch 'develop' of github.com:saltstack/salt into hotfix/immutable-lists-sum 2014-03-13 16:03:50 +00:00
Mathieu Le Marec - Pasquet
ab0b465d3e Yet another fix for ImmutableProxyList 
This is related to #11088, #11035, #11003, #11190.
 2014-03-13 10:53:55 +01:00
Pedro Algarvio
e1c33dcad6 Revert "Stop running the test while it's failing" 
This reverts commit a084303c91.
 2014-03-12 21:52:08 +00:00
Pedro Algarvio
a084303c91 Stop running the test while it's failing 2014-03-10 23:52:38 +00:00
Pedro Algarvio
fd1bab0d8d Add test case which triggers #11003. 2014-03-10 17:47:22 +00:00
Erik Johnson
98bcd26139 Fix pkg test with dots in filename 
The package here is much smaller and should install quicker than the old
one.
 2014-02-11 11:22:34 -06:00
Thomas S Hatch
8ce74e0378 disable dot test, need to find another package 2014-02-11 09:41:10 -07:00
Pedro Algarvio
3fceb028eb Ignore and remove unused imports 2014-02-08 07:46:50 +00:00
Pedro Algarvio
fd306ea0b0 We need a bigger timeout, salt's repo is pretty big now. 2014-02-08 03:07:30 +00:00
Pedro Algarvio
b66418e263 Provide tests cases for #10197 and #10198 2014-02-05 21:56:08 +00:00
Thomas S Hatch
94a6b01522 Merge pull request #10011 from makinacorpus/fix10010 
display full jinja traceback when applicable
 2014-01-29 07:41:29 -08:00
Mathieu Le Marec - Pasquet
688abda402 display full jinja traceback when applicable 
This fixes #10010
 2014-01-29 02:04:12 +01:00