Commit Graph

6646 Commits

Author SHA1 Message Date
Pedro Algarvio
48b5e6a3c5 Travis should run the destructive tests. 2012-09-29 19:44:19 +01:00
Pedro Algarvio
42c375cbd9 Allow passing options to tests/runtests.py from python setup.py test. 2012-09-29 19:41:21 +01:00
Pedro Algarvio
e8766b7b8d Allow certain tests to marked as destructive.
* Some tests might be considered destructive, such as adding or removing users from the system. This change allows those tests to be skipped unless stated otherwise.

```python

from saltunittest import destructiveTest

class ATestCase(TestCase):

    @destructiveTest
    def test_some_destructive_code(self):
        """Some destructive code."""

```

On the console we get something like:
```
test_destructive (unit.config_test.ConfigTestCase) ... skipped 'Destructive tests are disabled'
```
2012-09-29 15:42:43 +01:00
Pedro Algarvio
ced9e7d91e Remove the tests added to explicitly fail. 2012-09-29 12:51:39 +01:00
Pedro Algarvio
6896fd0ab8 Allow disabling the tests report. 2012-09-29 12:48:50 +01:00
Pedro Algarvio
b8917071f6 Provide an overall tests report.
Previously we have to go through the scroll history to see which tests failed, which were skipped, etc. Now, besides test failures, errors and skips being reported like they always were, we also provide a nice overall report and the end.
2012-09-29 12:10:06 +01:00
Thomas S Hatch
600485b712 Merge pull request #2133 from koentje/develop
Fix Docstring reference to httpd in nginx module
2012-09-28 18:17:26 -07:00
Koen Wilde
3f94c5a97a Fix Docstring reference to httpd in nginx module
The Docstring of the signal function in the nginx module still referred to
'httpd' instead of 'nginx'.
2012-09-29 02:43:05 +02:00
Thomas S Hatch
f1dca86fd4 Fix some quotes 2012-09-28 17:40:30 -06:00
Thomas S Hatch
59e775ed8d remove unused skipif 2012-09-28 17:35:59 -06:00
Thomas S Hatch
838d471cbf pylint fix 2012-09-28 17:26:13 -06:00
Thomas S Hatch
184393ec84 Pylint updates for ca modules 2012-09-28 17:04:38 -06:00
Thomas S Hatch
e374ab4877 missed indent error 2012-09-28 13:43:44 -06:00
Thomas S Hatch
7494e259f1 Move watch modify into check_requisite 2012-09-28 13:41:45 -06:00
Thomas S Hatch
632d2ab041 Apparently modprobe -l is gone! So we need to do this a better way 2012-09-28 13:28:50 -06:00
Thomas S Hatch
52e3e34a0c Fix syntax error 2012-09-28 12:43:53 -06:00
Thomas S Hatch
1db57e3681 fix Arch os grain 2012-09-28 12:04:24 -06:00
Thomas S Hatch
38faf1a25c Merge pull request #2128 from s0undt3ch/issues/2068
Fix #2068
2012-09-28 10:00:57 -07:00
Pedro Algarvio
7f7b196f1e Include an invalid items test for state.template* functions. Refs #2068. 2012-09-28 17:56:13 +01:00
Pedro Algarvio
b28a80fab0 Minor whitespace formatting 'prettyfication'. 2012-09-28 17:44:35 +01:00
Pedro Algarvio
2211afa63a Properly render the high state loaded from templates. Fixes #2068.
Previously using `state.template` or `state.template_str` would not be checked/rendered into proper formatting resulting in some templates not being correctly executed. For example, the following template worked:
```
/tmp/issue-2068-template-str:
  virtualenv:
    - managed
    - no_site_packages: True
    - distribute: True

pep8-pip:
  pip:
    - installed
    - name: pep8
    - bin_env: /tmp/issue-2068-template-str
    - mirrors: http://testpypi.python.org/pypi
    - require:
      - virtualenv: /tmp/issue-2068-template-str
```
as opposed to the following which did not work:
```
/tmp/issue-2068-template-str:
  virtualenv.managed:
    - no_site_packages: True
    - distribute: True

pep8-pip:
  pip.installed:
    - name: pep8
    - bin_env: /tmp/issue-2068-template-str
    - mirrors: http://testpypi.python.org/pypi
    - require:
      - virtualenv: /tmp/issue-2068-template-str
```
The dotted names should be converted into lists for example, which was the problems with the two examples above.
2012-09-28 17:34:55 +01:00
Pedro Algarvio
677a08fe7d Update the test cases which better expose #2068. 2012-09-28 16:04:38 +01:00
Thomas S Hatch
fae2acfc2d Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-27 19:28:31 -06:00
Thomas S Hatch
818c2bafaa Fix #2125 2012-09-27 19:28:08 -06:00
Thomas S Hatch
33fde4f2c3 Merge pull request #2126 from FireHost/windows_freeze_docs
Add Windows frozen minion docs
2012-09-27 18:11:28 -07:00
Aaron Tygart
06c02ca6f4 Add Windows frozen minion docs 2012-09-27 19:49:10 -05:00
Pedro Algarvio
cc10ed1906 Add include and exclude test cases. Refs #2068. 2012-09-28 01:17:37 +01:00
Pedro Algarvio
c80ea695b1 Let's narrow any possible errors by reusing the same template contents. Refs #2068. 2012-09-28 00:22:24 +01:00
Pedro Algarvio
fcd7fcc436 Merge branch 'develop' of github.com:saltstack/salt into issues/2068 2012-09-28 00:10:25 +01:00
Thomas S Hatch
9b360232bd Fix for #2068, needs testing 2012-09-27 17:06:32 -06:00
Pedro Algarvio
60fe1695a3 Merge branch 'develop' of github.com:saltstack/salt into issues/2068 2012-09-27 23:43:29 +01:00
Thomas S Hatch
a7d516ab6a Merge pull request #2124 from FireHost/cleaner_platform_detect
Add slightly nicer platform detection
2012-09-27 15:35:03 -07:00
Aaron Tygart
f8df121204 Add slightly nicer platform detection 2012-09-27 17:30:47 -05:00
Thomas S Hatch
18ad1064cc Merge pull request #2122 from morganfainberg/develop
Fix Test Errors now that FileSystemLoader is used for fallback
2012-09-27 15:11:38 -07:00
Morgan Fainberg
7800157e37 Fix the test for jinja, local (non salt:// files) now can support {% include %} 2012-09-27 14:55:55 -07:00
Thomas S Hatch
857cff66af Fix #458 2012-09-27 15:40:17 -06:00
Thomas S Hatch
2544cf4f08 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-27 15:08:11 -06:00
Thomas S Hatch
5ce30381ae Remove stray print statement, Fix #2121 2012-09-27 15:07:43 -06:00
Thomas S Hatch
e066a8f3c6 Merge pull request #2120 from scott-w/develop
Supervisor Stop State
2012-09-27 13:48:24 -07:00
Seth House
184e4bbd22 Added note about #salt-devel 2012-09-27 13:54:13 -06:00
Scott Walton
ce4237e2bd Fixed test failures #2026 2012-09-27 20:04:18 +01:00
Thomas S Hatch
7410ec43d6 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-27 12:43:39 -06:00
Thomas S Hatch
1c719f62cc Seed the success key 2012-09-27 12:40:46 -06:00
Scott Walton
768487995d Merge remote-tracking branch 'upstream/develop' into develop 2012-09-27 19:35:13 +01:00
Thomas S Hatch
01175b9e16 Merge pull request #2119 from FireHost/fix_os_fullnames
Add 'osfullname' grain. Fix 'os' grain long names
2012-09-27 11:31:08 -07:00
Aaron Tygart
26ffc5ef7d Add 'osfullname' grain. Fix 'os' grain long names 2012-09-27 13:22:34 -05:00
Pedro Algarvio
fb2b87a675 Merge branch 'develop' of github.com:saltstack/salt into issues/2068 2012-09-27 19:08:13 +01:00
Pedro Algarvio
6e2ba6885e Fix test case assertion. 2012-09-27 18:43:15 +01:00
Thomas S Hatch
1dec24b158 Merge pull request #2116 from s0undt3ch/issues/2113
The pip module now uses `cmd.run_all`. Fixes #2113.
2012-09-27 10:41:02 -07:00
Pedro Algarvio
eec932799a The pip module now uses cmd.run_all. Fixes #2113.
* In order to check if something went wrong while running the various pip commands using the command module, we need to know, at least, the return code, this way we can report the failure.
* `salt.modules.pip.uninstall()` now returns the `cmd.run_all` `dict` instead of a list of strings. **This breaks previous behaviour**.
* Added a test case for `salt.modules.pip.uninstall()` changes.
2012-09-27 18:33:50 +01:00