rallytime
eceadb82b1
Move tearDown functionality into test_instance
...
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
2015-02-27 14:53:54 -07:00
rallytime
14f4d28cd6
Add some more tests to catch API changes for digital ocean
2015-02-27 14:53:54 -07:00
Justin Findlay
68f06aae51
add integration test for #18317
2015-02-27 14:53:53 -07:00
Justin Findlay
3b7ba92089
adding cmd.run integration tests
2015-02-27 14:53:53 -07:00
Nicole Thomas
c2ca579906
Merge pull request #20965 from rallytime/joyent_cloud_tests
...
Add Joyent cloud provider tests
2015-02-27 14:42:08 -07:00
Pedro Algarvio
38ddbbc227
Fix imports
2015-02-26 09:41:22 +00:00
rallytime
95d4fb801c
Skip the ec2 nightly cloud tests for now
...
Something fundamental has changed with the way ec2 interacts with
the test runner starting in 2015.2 (and consequentially develop).
Let's skip these tests for now until we can pin down why so we don't
muddy the cloud-testing waters.
2015-02-24 16:07:23 -07:00
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
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
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
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
726f8dc2ac
Check that __context__ is always present, since it now is (properly)
2015-02-07 11:59:00 -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
Thomas Jackson
02e219e452
Pack modules to runners
2015-02-07 11:54:39 -08:00
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07:00
Justin Findlay
7c943ec8a7
only add successfully generated ssh keys to config
2015-02-04 16:16:41 -07:00
rallytime
759ce02829
Pylint fix for 2015.2
2015-02-03 10:02:05 -07:00
Mike Place
68418d79a7
Typo
2015-02-02 13:52:26 -07:00
Mike Place
5291cf7809
Better detection for minimum pyzmq version
2015-02-02 13:52:26 -07:00
rallytime
c65d9673a7
Merge branch '2014.7' into merge_forward_fifteen_second_try
...
Conflicts:
salt/states/file.py
2015-01-29 13:42:49 -07:00
Thomas Jackson
3d1ae49d09
Pass opts not an ImmutableDict of opts
2015-01-28 18:43:45 -08:00
Thomas Jackson
645027c0fe
cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"
...
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.
apparently I picked up some other changes I didn't mean to
Conflicts:
salt/utils/event.py
tests/integration/utils/test_reactor.py
2015-01-28 18:43:43 -08:00
Thomas Jackson
5bfef71240
Pylint fix
2015-01-28 18:43:43 -08:00
