Commit Graph

155 Commits

Author SHA1 Message Date
Justin Findlay
34ba477b09 tests.runtests: configurable filehandle limits 2016-03-10 10:57:18 -07:00
Justin Findlay
3a77e7d383 tests.runtests: increase file limit for MacOS unit tests 2016-03-10 10:57:18 -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
Matthew Cillo
ba33d75949 passing lint test 2016-03-06 17:19:08 -05: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
Erik Johnson
f107d1a288 Support running grains tests 2016-02-24 10:28:10 -07:00
Justin Findlay
f671c3bf3b tests.runtests: add minion test runner 2016-02-23 13:47:47 -07:00
Erik Johnson
5c833efc01 Support running grains tests 2016-02-22 21:55:32 -06:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
2015-12-01 15:31:03 -07:00
Mike Place
063f075a99 Add integration renderer tests to the suite 2015-11-25 10:14:46 -07:00
rallytime
cded9ac01d Merge branch '2015.8' into 'develop'
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
2015-11-06 09:34:31 -07:00
rallytime
eec9d69387 Merge branch '2015.5' into '2015.8'
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/file.py
	tests/integration/__init__.py
2015-11-04 15:52:59 -07:00
twangboy
0da6ff7c50 Fixed some logic 2015-11-03 10:09:49 -07:00
twangboy
cf1e059be5 Fixed windows tests 2015-11-02 16:16:22 -07:00
Nitin Madhok
d94485d336 Fix permission on tests/runtests.py on 2015.5 branch 2015-08-12 13:04:17 -04:00
Pedro Algarvio
e7681f7c75 Try to overcome a failure to get cwd in Cent tests 2015-07-28 12:07:04 +01:00
Justin Findlay
5dadaec775 add tcp transport to jenkins and runtests 2015-07-20 16:56:00 -06:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions
- Allows you to set power settings on a windows minion for things like the monitor and disk
2015-05-12 14:49:48 +02:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
rallytime
9830708f86 Some small test clean up changes 2015-04-24 16:27:22 -06:00
Mike Place
f3df92834d More helper text, refactor filehandles, clean up 2015-04-03 15:34:47 -06:00
Mike Place
275993ee18 Include parser option for --no-tests 2015-04-03 15:34:46 -06:00
Mike Place
baf2c40f88 More helper text, refactor filehandles, clean up 2015-03-13 16:15:23 -06:00
Mike Place
56650f7e35 Include parser option for --no-tests 2015-03-13 13:18:54 -06:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Colton Myers
c331a3c5cc 644 permissions 2015-01-23 16:59:09 -07:00
Colton Myers
dd61682968 Fix runtests permissions 2015-01-23 14:22:19 -07:00
Mathias Gug
a454d71bd5 Fix coding style. 2015-01-22 14:24:30 -07:00
Mathias Gug
97d0f93fd3 Fix coding style. 2015-01-14 13:06:43 -08:00
jfindlay
f329ec9104 Merge pull request #19422 from Seveland12/develop
Fixed spelling of "below" in 9 different files.
2015-01-07 09:32:44 -07:00
rallytime
98a290ab04 Fix file permissions pylint error 2015-01-07 08:52:32 -07:00
rallytime
5f6af88afb Merge branch '2015.2' into 'develop' 2015-01-07 07:54:10 -07:00
rallytime
80b07f3578 Merge branch '2014.7' into '2015.2'
Conflicts:
	tests/buildpackage.py
2015-01-06 20:32:36 -07:00
Pedro Algarvio
a9eaf187e1 Ignore the file perms lint check 2015-01-07 01:15:56 +00:00
sjwehry
342608d9bd Fixed spelling of "below" in 9 different files. 2015-01-06 19:55:28 -05:00
rallytime
ed3a34624c Fix djangomod.py integration test failures 2015-01-06 22:26:46 +00:00
Nitin Madhok
c992f04f32 Changing permissions of test files and fixing lint violations 2014-12-19 05:50:18 -05:00
Pedro Algarvio
50c437f8c5 Use atexit for the cleanup 2014-11-26 00:41:02 +00:00
Pedro Algarvio
593544b577 Move cleanup_runtime_config_instance out of TestDaemon 2014-11-26 00:20:27 +00:00
Pedro Algarvio
e8104167f4 Forced clean up of runtime config dictionary which includes a local client 2014-11-25 00:33:45 +00:00
Pedro Algarvio
7cab740adf Removed --runner because it's integrated in the client tests 2014-10-08 01:02:10 +01:00
rallytime
72de420e2d Tell jenkins to run integration tests for salt/runner.py 2014-08-28 10:53:22 -06:00
rallytime
e1dde7c574 Enable wheel integration tests in runtests.py 2014-08-27 09:34:44 -06:00
Mike Place
12f851ec3a Clean keyboard exit in test suite 2014-07-10 12:52:43 -06:00
Pedro Algarvio
77aeefe261 Fix dest value 2014-07-10 00:41:26 +01:00
rallytime
e8fde1b125 Add cli option for batch tests to runtests.py 2014-07-09 15:16:13 -06:00
Pedro Algarvio
3c73c9c4c6 Provide a switch to run the NetAPI tests. 2014-06-19 12:58:52 +01:00
Pedro Algarvio
b815bb8cb6 Call the right parent class 2014-06-15 13:05:18 +01:00
Pedro Algarvio
ccdd70750c Leave any cleanup for the end 2014-06-15 13:05:18 +01:00
Pedro Algarvio
7fbc839942 Lay down computed configuration and use that source for all of the tests 2014-06-15 13:05:17 +01:00