Commit Graph

190 Commits

Author SHA1 Message Date
Erik Johnson
20724839a9 Fix for running just the grains tests
The -G/--grains/--grains-tests option was being ignored because a suite
was not defined for it. This adds the option, and also adds a dunder
init to satisfy the test parser.
2017-03-22 14:11:22 -05:00
Pedro Algarvio
c687b6112a
Account for test module names prefixed with tests. 2017-03-03 12:41:27 +00:00
Pedro Algarvio
661b6416b7
Allow passing a test module path to runtests.py to run its tests
Example:

```
python tests/runtests.py -v tests/integration/states/test_alternatives.py
```
2017-03-02 19:12:43 +00:00
Pedro Algarvio
ab83cced63
Child processes termination cleanup 2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
2017-02-28 22:52:49 +00:00
Pedro Algarvio
08804932c3
Using pytest start_daemon 2017-02-28 22:52:48 +00:00
Pedro Algarvio
5d5a3ee01e
All tests now follow the test_*.py pattern. 2017-02-23 23:19:42 +00:00
twangboy
77d3a584a4 Set hard limit on Windows 2017-02-17 13:52:27 -07:00
Pedro Algarvio
b82bf6bebf
Inform on which python version we are running on 2017-02-09 18:06:30 +00:00
twangboy
c704eaa175 Fix geteuid stacktrace on Windows 2017-01-30 15:36:08 -07:00
Pedro Algarvio
092e863842
Account for a not recent enough salt-testing library 2016-08-23 19:04:49 +01:00
rallytime
d2340a0aad Merge branch '2016.3' into 'develop'
Conflicts:
  - pkg/windows/build.bat
  - pkg/windows/build_pkg.bat
  - tests/runtests.py
2016-08-17 12:13:26 -06:00
rallytime
c305d8d99b Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/conf.py
  - tests/runtests.py
2016-08-17 10:37:57 -06:00
Ch3LL
c9b7c3cf80 need to add returners option in other places 2016-08-09 13:53:42 -06:00
Ch3LL
6837acf742 add job cache integration tests 2016-08-08 17:01:02 -06:00
twangboy
4e56d28993 Add tcp_master settings to both masters 2016-07-20 10:00:31 -06:00
twangboy
b5b0b9ae4b Add more info to --interactive report 2016-07-20 10:00:30 -06:00
twangboy
81d7479dfb Remove backtick 2016-07-20 10:00:30 -06:00
twangboy
c1ae2537f1 Remove configuration from configs 2016-07-20 10:00:30 -06:00
twangboy
55b8ea664e Remove redundant tcp_pull_port entry for minion 2016-07-20 10:00:30 -06:00
twangboy
79b5be6989 Add more descriptive report for interactive mode 2016-07-20 10:00:30 -06:00
Nicole Thomas
08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3
[develop] Merge forward from 2016.3 to develop
2016-06-09 14:12:48 -04:00
Tom Williams
102d696460 INFRA-1594 - fix up unit tests 2016-06-06 14:37:38 -04:00
rallytime
9220ea0729 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/conf.py
  - salt/minion.py
  - salt/modules/mac_brew.py
  - salt/modules/pkgng.py
  - salt/states/apache_module.py
  - salt/states/ini_manage.py
  - salt/states/win_servermanager.py
2016-06-02 10:13:34 -04:00
Justin Findlay
c53a727c18 tests.runtests: use globally-determined tempdir
This way, the the test logs will use the same temp dir as the rest of
the test suite.  On MacOS, for example, `$TMPDIR` is set to a path that
is too long for unix sockets on the system, so the `SYS_TEMP_DIR` is set
to `/tmp` to override this.
2016-05-31 13:27:50 -06:00
Mike Place
d5a3e309bf Event assert (#33262)
* Initial POC

* Allow the queue to fill by waiting for the lag in IPC

* Add docs

* Add run_tests

* Add reactor to tests
2016-05-19 13:41:23 -06:00
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