rallytime
e26cac4599
Pylint fix
2015-02-24 10:58:39 -07:00
rallytime
b51492486f
Add Joyent cloud provider tests
2015-02-20 17:25:07 -07:00
Colton Myers
c3b7be0655
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/rhel.rst
salt/output/__init__.py
salt/utils/__init__.py
2015-02-20 13:51:59 -07:00
jfindlay
ca79845b2f
Merge pull request #20848 from rallytime/new_requisites_tests
...
Integration tests for the new requisites added in 2014.7
2015-02-19 18:29:00 -07:00
rallytime
c3f786c966
listen and listen_in requisite tests
2015-02-19 16:13:23 -07:00
rallytime
1437c9a1f5
onfail and onfail_in requisite tests
2015-02-19 14:35:26 -07:00
rallytime
208b4906d8
Onchanges and onchanges_in requisite tests!
2015-02-19 13:06:38 -07:00
rallytime
8f0e80bd66
Add one onchanges requisite test
2015-02-18 17:16:07 -07:00
Justin Findlay
0d6663b8a8
conform shell integration tests to txt runner
2015-02-17 15:40:17 -07:00
Justin Findlay
b39f962369
add state module requested state run tests
...
closes #16901
2015-02-17 14:23:14 -07:00
jfindlay
59eaabea0a
Merge pull request #20688 from rallytime/bp-20125
...
Backport #20125 to 2015.2
2015-02-13 11:46:21 -07:00
Mike Place
d1d52d2245
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-02-13 10:48:39 -07:00
Mike Place
7a9428d9f5
Typo
2015-02-13 10:17:17 -07:00
Mike Place
37b375ba8b
Use cls attr
2015-02-13 10:17:17 -07:00
Mike Place
b9fa5e4e29
Reset env at end of test
2015-02-13 10:17:17 -07:00
jfindlay
26a0afdf57
Merge pull request #20661 from jacksontj/2015.2
...
2015.2
2015-02-13 08:49:59 -07:00
Thomas Jackson
90dc0ec4ec
pylint
2015-02-12 17:06:41 -08:00
Thomas Jackson
c4b9c076e8
Check key types in lazyloader
...
Better fix for #20623 and a test case
2015-02-12 17:06:41 -08:00
Nicole Thomas
f82183d13d
Merge pull request #19235 from terminalmage/lxc-refactor
...
LXC Refactor
2015-02-12 17:16:52 -07:00
Colton Myers
b2a80b195e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-02-12 11:44:57 -07:00
Thomas S Hatch
9e054f3890
Merge pull request #20616 from rallytime/merge-20419
...
Merge #20419 with test syntax fix
2015-02-12 10:38:53 -07:00
rallytime
6b2d64b557
Fix second pylint error that popped up
2015-02-11 22:07:37 -07:00
rallytime
789570fb94
Fix pylint/syntax of test in which_test to merge #20419
2015-02-11 21:48:34 -07:00
Hung Nguyen Viet
d10ce3ade2
fix unittest for windows
2015-02-12 01:37:40 +07:00
rallytime
cffbca44b6
Pylint fix - remove unused import
2015-02-11 09:35:04 -07:00
rallytime
533adca23a
Merge branch '2014.7' into merge_forward_15
2015-02-11 08:48:14 -07:00
Mike Place
194ad0f8b1
Last time with find removed
2015-02-11 08:45:37 -07:00
jfindlay
a4572f34f3
Merge pull request #20578 from rallytime/bp-20561
...
Backport #20561 to 2014.7
2015-02-10 20:51:23 -07:00
Mike Place
c41998cc4f
Remove another test.
2015-02-10 17:12:31 -07:00
Mike Place
836b525779
Disable gitfs test that does not produce valuable data
2015-02-10 17:11:04 -07:00
Erik Johnson
706ce858b4
Disable LXC integration tests for now
2015-02-10 15:06:47 -06:00
Erik Johnson
f18a23c284
Ignore lack of CLI example in deprecated function
2015-02-10 15:06:47 -06:00
Arnold Bechtoldt
9de6c1d839
improve test tests/unit/utils/validate_net_test.py useability
2015-02-09 11:52:08 +01:00
Arnold Bechtoldt
50ecfef1db
do call class methods correctly
2015-02-09 09:45:12 +01:00
Arnold Bechtoldt
2c5f5f8bf7
fix pep8 lint checks, refs #20508
2015-02-09 09:14:38 +01:00
Arnold Bechtoldt
ef7834db76
fix broken ipv6 address verification in salt.utils.validate.net
2015-02-08 23:48:05 +01:00
Thomas Jackson
438ede78ba
Support arbitrarily deep modules
...
Note: salt can still only *call* modules on the first depth, but they can then import anything below
2015-02-07 14:55:30 -08:00
Thomas Jackson
249096c292
Change modulekey for submodule test-- to avoid namespace collisions
2015-02-07 12:02:26 -08:00
Thomas Jackson
7605ba60a8
pylint
2015-02-07 12:02:26 -08:00
Thomas Jackson
ca5eac3936
Add support for submodules to LazyLoader
...
This was a feature that was inadvertently removed in #20274 , but since it was undocumented and untested no one noticed. Thanks to @steverweber for pointing it out.
This includes the feature as well as tests.
2015-02-07 12:02:26 -08:00
Thomas Jackson
725708a04b
Correct tag name in loader tests
2015-02-07 12:02:23 -08:00
Thomas Jackson
bb89068010
Add "disabled" support
...
this allows you to "blacklist" modules.
Addition to #20274
Conflicts:
salt/loader.py
2015-02-07 12:02:03 -08:00
rallytime
15a140ece4
Moved tests/unit/loader.py to tests/integration/loader/loader.py
...
These are integration tests and not unit tests, so they should be
in the proper directory.
Also, fixed up the python 3 incompatability pylint errors.
2015-02-07 11:59:47 -08:00
Thomas Jackson
fb0d46f445
Pylint
2015-02-07 11:59:03 -08:00
Thomas Jackson
368e5a8e92
Add test for __func__alias__
2015-02-07 11:59:03 -08:00
Thomas Jackson
9ee188dd90
More loader tests
...
As well as an optimization on clear()
2015-02-07 11:59:01 -08:00
Thomas Jackson
fe2d141081
Add loader tests
2015-02-07 11:59:00 -08:00
Thomas Jackson
726f8dc2ac
Check that __context__ is always present, since it now is (properly)
2015-02-07 11:59:00 -08:00
Thomas Jackson
795fa12415
Remove test as well
...
Conflicts:
tests/unit/output/grains.py
Conflicts:
tests/unit/output/grains.py
2015-02-07 11:57:40 -08:00
Thomas Jackson
e1f8ea650f
Remove grains outputter
...
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working
Conflicts:
salt/output/grains.py
Conflicts:
salt/output/grains.py
2015-02-07 11:57:14 -08:00
