valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,808 Commits 24 Branches 182 Tags 341 MiB
4d96de6c59
Commit Graph

214 Commits

Author SHA1 Message Date
Justin Findlay
4e87700e8c tests.runtests: make test suite args consistent (#32808) 2016-04-25 14:57:33 -06: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
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
6a1a2f1316 Remove grains from TEST_SUITES dictionary - this dir doesn't exist 2016-02-26 13:29:44 -07:00
rallytime
fe35a88e28 Add test runner options that were lost in merge-forward 2016-02-26 11:38:21 -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
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
Justin Findlay
0fb1bbb883 tests.runtests: rename cloud provider tests 2016-02-24 22:16:57 -07:00
Justin Findlay
a98bcf6fd1 tests.runtests: reorder arg declarations 2016-02-24 22:16:57 -07:00
Justin Findlay
bc60c02cfe tests.runtests: refactor test suite usage 2016-02-24 22:16:57 -07:00
Justin Findlay
7a04ae5558 tests.runtests: add test suite data and fcns 2016-02-24 22:16:57 -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
Pedro Algarvio
7451e50f63 Limit the options for transport. 2014-06-11 23:09:34 +01:00
Thomas S Hatch
0b02be9af1 Initial code to do raet integration salt tests 2014-06-11 15:35:27 -06:00
Pedro Algarvio
8b03cd8d2e Decorate tests as expensive 
Less trouble for the new runtests script
 2014-06-10 19:25:04 +01:00
Pedro Algarvio
5a14e33ab3 Add parser option to run cloud provider tests to runtests.py 2014-06-10 03:17:41 +01:00
Pedro Algarvio
57dd2da63e Run the fileserver tests 2014-06-05 10:10:56 +01:00
Mike Place
cf25592c53 Working salt-ssh test runner 
This rounds out initial (alpha) support for a salt-ssh test runner.

At present, one must manually specify the --ssh flag to ensure that
the ssh deamons are spun up properly.

Conflicts:
	tests/integration/__init__.py
	tests/integration/files/conf/_ssh/sshd_config
	tests/integration/files/conf/sshd_config
	tests/integration/files/ext-conf/sshd_config
 2014-05-23 14:11:14 -06:00
Pedro Algarvio
a1aee355e5 Include outputter tests in tests suite. 2014-05-12 19:10:11 +01:00
Pedro Algarvio
9630d43d05 Add option to run SSH tests. 
Refs saltstack/salt-testing#16 and #12661
 2014-05-10 14:12:04 +01:00
Pedro Algarvio
8561be1fee For output consistency. 2014-02-09 00:21:18 +00:00
Pedro Algarvio
69d0f907f9 Make use of the print() function. 2014-02-03 11:07:43 +00:00
Pedro Algarvio
59573953b5 Also prepare runtests.py 2014-01-14 15:25:07 +00:00
Pedro Algarvio
0d81bb6416 The SaltTesting parser no longer supports HTML reports. 2013-12-16 00:14:58 +00:00
Pedro Algarvio
de742df8f7 Minor cosmetic printing changes 2013-12-11 14:23:11 +00:00
Pedro Algarvio
ac8963b286 Ignore the relative import warning. 2013-11-27 12:54:13 +00:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Pedro Algarvio
dfab7aab73 Adapt the runtests parser to support running the tests suite under a Docker container. 2013-11-08 20:20:03 +00:00
Pedro Algarvio
f96c01738e Provide the loader integration tests in it's own package. 2013-10-26 18:57:00 +01:00
Pedro Algarvio
725acec48b track_processes is no longer a valid `kwarg'. 2013-09-10 17:49:38 +01:00
Pedro Algarvio
8100b41c7e Fixed splitting named unittests from named integration tests. 
This commit got lost somewhere. I could swear I committed this fix previously...
 2013-08-21 19:23:16 +01:00
Pedro Algarvio
11060c85be Allow running a group of tests while still providing a test case name from another group. 2013-08-12 11:46:58 +01:00
Pedro Algarvio
305a5c2223 The parser destructive tests flag is now provided by salt-testing 2013-08-06 22:03:42 +01:00
Pedro Algarvio
94575cbb63 Finish what was started on f78fca32 2013-07-05 00:53:41 +01:00
Pedro Algarvio
f78fca3256 We don't need to pass -u when we're only passing unittests to -n. 2013-07-04 17:17:48 +01:00
Pedro Algarvio
007545eb70 Fix NameError 2013-06-28 00:12:58 +01:00
Pedro Algarvio
8cd0316b62 Heh! Salt! Not Salt Cloud! 2013-06-28 00:12:58 +01:00
Pedro Algarvio
a21b6e10a5 We don't want the tests in the coverage report. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
819e523c2b Use the defined SALT_ROOT as the source parameter for the coverage call. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
7990165e26 Remove debug logic to test coverage. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
3033e0002b Let's make use of salt-testing code coverage testing option parser. 2013-06-28 00:12:57 +01:00
Pedro Algarvio
222be7b446 Make sure every test module is runnable by __main__. 
* Double to single quotes
 2013-06-28 00:12:56 +01:00
Pedro Algarvio
d4fd1baa2f Adapted the tests suite to work with salt-testing 2013-06-28 00:12:56 +01:00
ZHANG Cheng
c86564abb1 Fix typo 2013-06-22 23:31:37 +08:00
Thomas S Hatch
86db665d2d kill the print 2013-06-18 15:45:50 -06:00
Thomas S Hatch
535d0a00e3 Finish #5585 2013-06-17 13:05:08 -06:00
ZHANG Cheng
c8aee0451d Make it possible to run a single unit test 2013-06-17 23:38:13 +08:00
Chris Rebert
a6a356a3e4 runtests.py: use except-as syntax 2013-06-03 11:45:44 -06:00
Pedro Algarvio
8938b93b3f Run our own API based coverage 2013-06-02 09:07:39 +01:00
Pedro Algarvio
a61273bd71 Finally working. Cleaning up. 2013-05-31 12:48:53 +01:00
Pedro Algarvio
662f5b23ca Output the coverage pickled data. 2013-05-31 12:48:53 +01:00
Pedro Algarvio
63859e2915 Even more info from travis env. 2013-05-31 12:48:53 +01:00
Pedro Algarvio
51460af985 Fix SyntaxError. 2013-05-31 12:48:53 +01:00