valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71,403 Commits 24 Branches 182 Tags 341 MiB
9b14dc0a6e
Commit Graph

54 Commits

Author SHA1 Message Date
Justin Findlay
4e709ab2be tests/unit/pydsl_test.py: remove env support 2016-02-16 20:33:23 -07: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
81bf332be4 Migrate pydsl tests to integration test suite 
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.

The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
 2015-11-24 15:46:14 -07:00
Erik Johnson
9fee076477 tests/unit/pydsl_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Michael Steed
56941f9432 rm pdb invocation :/ 2015-06-11 15:07:52 -06:00
Michael Steed
6f0da2a9a8 py3: (mostly) fix tests/unit/pydsl_test.py 
One test is still failing under python 3
 2015-06-11 15:05:30 -06:00
Pedro Algarvio
2a850bc6cb Options should not be globally defined. Do the right thing. 2015-01-30 22:27:15 +00:00
Pedro Algarvio
0726464344 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Mike Place
dc538853c6 Avoid file cache problem in pydsl tests 
Using the same copy of opts was causing the cache refresh to not find
any files because they had already been cleaned up!
 2015-01-27 14:30:56 -07:00
Mike Place
c30c3ac418 Forcefully reset the highstate stack on each pydsl test 2015-01-26 10:43:53 -07:00
Mike Place
b2ef5292c0 Lint 2015-01-23 15:49:02 -07:00
Mike Place
ffa004a26c Fix exception that happens inside jinja renderer during test run 2015-01-23 15:49:02 -07:00
Mike Place
df4b369e30 Split a test out into its own class to keep it from colliding 
Otherwise, setUp/tearDown clobbers the class var in HighState, resulting
in frequent failures.
 2015-01-23 15:49:02 -07:00
Pedro Algarvio
737bd84402 Switch open() for salt.utils.fopen() 2014-11-26 18:28:56 +00:00
Pedro Algarvio
8d9570ef43 Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Mike Place
623b01af81 Pylint 2014-05-29 16:13:42 -06:00
Mike Place
0e53190996 Fix broken tests 
Thanks to @rallytime for pointing out that several unit tests
were not working correctly when run locally.

I have fixed the perm_test to no longer use relative paths. I have
also disabled this tests since, at some point at least, perms changed
to be 0664 instead of 0644 in a number of places. This warrents further
discussion.

I have fixed pydsl_test to no longer throw errors to stdout about
missing SLS files. (Yay!!)

I have fixed the smtp_return tests so that it will without errors
on hosts with gnupg installed.
 2014-05-29 15:04:11 -06:00
Thomas S Hatch
0569fd06de pytlint 2013-12-13 16:30:47 -07:00
Kaithar
b1ac292873 Made state_highstate more useful. 2013-12-13 05:47:25 +00:00
Kaithar
5836b1b040 Missing newline 2013-12-13 04:53:47 +00:00
Kaithar
866bc66bac Unit test for including a state multiple times using pydsl. 2013-12-13 05:41:38 +00:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Pedro Algarvio
badf339b01 Improve code readability. 2013-10-16 21:51:51 +01:00
Pedro Algarvio
cf7a0b6205 Don't trigger state events on pydsl unit tests. 2013-10-03 00:59:03 +01:00
Pedro Algarvio
8856c7a039 Dam! Missing import. 2013-08-13 10:38:37 +01:00
Pedro Algarvio
9d711508f5 Skip running the test is not attached to a TTY. 2013-08-13 10:25:49 +01:00
Thomas S Hatch
909edec564 Skip pydsl test without tty 2013-08-10 14:04:18 -06:00
Pedro Algarvio
785188802f Temporary directories should respect integration.SYS_TMP_DIR 
Also, skip if the directory was not actually created.
 2013-08-10 20:10:10 +01:00
Pedro Algarvio
b03a5fcee3 Stop using the deprecated check_dns in salt.config.minion_config. 2013-07-20 01:38:09 +01:00
Pedro Algarvio
cb0922faf7 Updated some of the test cases to use a much more readable approach using salttesting.helpers.ensure_in_syspath(). 2013-06-28 00:12:59 +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
Thomas S Hatch
367927b3d3 Fix #4912 
Clint, this fixes it for me and still logicaly verifies the test
let me know if this works on your end
 2013-05-07 22:36:34 -06:00
Chris Rebert
26209c1fc1 rm unused imports reported by pyflakes 2013-04-30 14:48:04 -07:00
Pedro Algarvio
5f58f0d28b We need OrderedDict support. So, as a last resort, provide our own. 
* We try to import `OrderedDict` from the standard library, which is only available on python >= 2.7, if `ImportError` is raised we try to import it from `ordereddict`, a package available in PyPi. As a last resort, we provide our own implementation based on http://code.activestate.com/recipes/576669/.
* Update all code requiring `OrderDict` to use our compatible import module.
 2013-04-23 12:56:23 +01:00
Jack Kuan
ede7d9a762 Added doc for render time state execution and also fixed a bug with the feature. 2013-02-10 00:37:31 -05:00
Jack Kuan
fa7e327baf Fix the merge conflicts in tests/unit/pydsl_test.py 2013-02-09 21:28:35 -05:00
Thomas S Hatch
f65626db0b Update pydsl tests, still failing though 2013-02-09 15:07:59 -07:00
Thomas S Hatch
e63a01f853 Add docstring 2013-02-09 14:41:16 -07:00
Thomas S Hatch
ace2aade9f Fix binary file issue from merge 2013-02-09 14:40:31 -07:00
Thomas S Hatch
858e86d597 Merge branch 'pydsl_compile_time_state_execution' of git://github.com/kjkuan/salt into kjkuan-pydsl_compile_time_state_execution 
Conflicts:
	tests/unit/pydsl_test.py
 2013-02-09 14:31:36 -07:00
Jack Kuan
106cc0aa0e Move the pydsl module into salt/utils/. 2013-02-08 17:49:21 -05:00
Thomas S Hatch
42024cab39 Clean out unused code 2013-02-08 10:57:20 -07:00
Pedro Algarvio
df2ac900c3 Fix pydsl unittest skip message + PEP8. 2013-02-06 05:10:47 +00:00
Jack Kuan
9bf7f72a43 Now calling a state(id declaration) at compile/render time executes it using salt['state.high'](). 
Also fixed a bug: Now we prevent the use of extend() after ordered execution was turned on once.
 2013-02-05 14:50:40 -05:00
Jack Kuan
b7571dd891 Add support for #3483([pydsl] Import Python definitons from included files). 2013-02-01 12:32:19 -05:00
Jack Kuan
0976f42410 Fix test case skipping logic: if < py2.7 then no OrderedDict, so skip. 
For ordered execution, PyDSL requires py2.7 or above. Although, it's
possible to make it work with a third-party OrderedDict implementation
like the yaml renderer does..., this is not bothered here.
 2013-01-24 12:21:54 -05:00
Jack Kuan
5ad5cd9b6e Fix a bug in the pydsl test case. 2013-01-21 10:27:06 -05:00
Jack Kuan
897f877bed Added docs for pydsl and fixed a syntax inconsistency. 2013-01-20 01:21:05 -05:00
Pedro Algarvio
3629fe88c0 Fix tests.unit.pydsl_test and tests.unit.stateconf_test. 
No more errors are shown because the configuration files are not readable, and in fact, the minion configuration can be use, unlike what was said in the comment.
 2013-01-20 04:09:07 +00:00