valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,346 Commits 24 Branches 182 Tags 341 MiB
6e0e8fddf9
Commit Graph

673 Commits

Author SHA1 Message Date
Christian Franke
e46276db16 Improve file.directory for clean=True 
Handle exclude_pat when running with test=True and add
some tests to verify correct behavior.
 2013-06-11 02:28:51 +02:00
Tris Forster
714acc50d3 Add success flag to LocalClient.get_full_return() 2013-06-06 10:09:15 +10:00
Chris Rebert
31e5c275c5 rm unnecessary parens around 'del'; it's not a function 2013-06-03 11:53:04 -07:00
Thomas S Hatch
324f048ae5 Raise sleep here because travis is SLOW 2013-05-31 02:00:56 +00:00
Thomas S Hatch
753355c501 Add tests to check cross minion validity in the mine 
Tests for #5281
 2013-05-29 21:26:55 +00:00
Ollie Walsh
32b80759d7 Reuse virtualenv for all supervisor tests 2013-05-29 12:54:57 +01:00
Ollie Walsh
59dbcc4375 Merge branch 'develop' into supervisor-fixes 2013-05-29 12:37:13 +01:00
Ollie Walsh
1eca34f8e6 Give supervisor a little time to startup during tests 2013-05-29 11:39:09 +01:00
Thomas S Hatch
82dde7d7e7 Add a sleep to give the minion a chance to catch grain refresh in test 2013-05-29 00:12:30 -06:00
Ollie Walsh
4948914766 Add missing test file 2013-05-29 00:47:25 +01:00
Ollie Walsh
57cba99b06 Supervisor module: 
Support running supervisor from a virtualenv/custom path.
Support custom supervisor config file.
Create real tests using a virtual environment.

Supervisor state:
Fix restart when process is already running.
Support restart on watch.
Create real tests using a virtual environment.
 2013-05-29 00:18:12 +01:00
Thomas S Hatch
ab9fbc94e7 Single quotes 2013-05-28 15:09:40 -06:00
Thomas S Hatch
2b917aef23 Add loop_interval to minion config for tests 2013-05-28 14:27:01 -06:00
Thomas S Hatch
c4c2b7936a Add tests for mine.send 2013-05-26 08:55:18 -06:00
Thomas S Hatch
49db655fd5 Add master side capability to make mine accept single funcs 2013-05-26 07:18:12 -06:00
Thomas S Hatch
d48702aaa5 Add mine_functions to grains 2013-05-26 06:59:13 -06:00
Thomas S Hatch
562fbdaed2 Add grains.get test 2013-05-26 06:11:59 -06:00
Thomas S Hatch
04ad87f9fb Add test to grains.setval 2013-05-26 04:11:42 -06:00
Thomas S Hatch
98bb5335df Disable failing config.manage_mode test, we will need to clean this 2013-05-26 03:52:22 -06:00
Thomas S Hatch
cf69f2d004 Add manage_mode test 2013-05-26 03:44:22 -06:00
Thomas S Hatch
f71a4ee2c8 Add more checks to config 2013-05-26 03:42:41 -06:00
Thomas S Hatch
44d1123291 Start on config module tests 2013-05-26 00:32:57 -06:00
Thomas S Hatch
e6c369c5ec Add opts to master file to test config module 2013-05-26 00:31:43 -06:00
Thomas S Hatch
340b45d801 fix pydsl test 2013-05-18 22:58:08 +00:00
Thomas S Hatch
6b01c8380d Add pydsl runtime test per #5055 2013-05-18 22:51:53 +00:00
Thomas S Hatch
123d52bdc6 Can't serialize pydev/stateconf, start on #5055 2013-05-18 22:47:14 +00:00
Matthew Scott
24d11b3274 Introduce no_chown option to pip-related functions - #4805 
Affected functions:
- `pip.install`
- `pip.installed`
- `virtualenv.managed`

When using `runas` in conjunction with a local-filesystem `requirements` file with these functions,
`pip.install` will create a temporary copy of the requirements file,
then change ownership of that file to the `runas` user.

The purpose of this is to avoid file permission errors when accessing the original requirements file.
However, this breaks when that file has a "-r otherfile.txt" line.

In these cases, set `no_chown` to `True`.
The original path to the requirements file will be kept,
and other requirements files included from the top-level file will be correctly found.
 2013-05-04 22:16:39 -05:00
Chris Rebert
c487d86fff tests: standardize to modern 'except FooError as err:' syntax 2013-05-03 19:55:50 -07:00
Ales Zoulek
383e1fa01c Fixing invalid assumption on group name in tests 
* fixed invalid assumption in file module tests that all linux platforms have
groups with the same name as users (joe:joe etc.). But for
example ArchLinux has only joe:users.

* file module tests now loads user's canonical group name from pwd and
grp python module instead.
 2013-05-03 11:47:08 +02:00
Chris Rebert
498d2999db more typo fixes 2013-05-01 16:52:52 -07:00
Chris Rebert
9ed364980d is not 0 => != 0 2013-04-30 10:32:21 -07:00
Pedro Algarvio
397418dad7 We're no longer leaking threads. Travis-CI should be OK with 10 worker threads. 2013-04-28 08:16:54 +01:00
Pedro Algarvio
c4e96207cb runas needs root permissions. 2013-04-27 21:06:13 +01:00
Thomas S Hatch
cebdf76f2e Fix publish tests 2013-04-27 12:59:34 -06:00
Pedro Algarvio
a4e9e196a3 Improve information available and handle IndexError in our salt asserts mix-in. 2013-04-25 20:59:34 +01:00
Pedro Algarvio
abd2dc23f1 Handle publish tests a little better. Still not fixed though. 2013-04-25 20:58:54 +01:00
Pedro Algarvio
55b166f38c Fix issues around salt.modules.file, salt.states.files and respective tests. 
* Updated `salt.modules.file.makedirs` to properly work. Any path passed to this function should be a directory, ie, if `/tmp/foo/bar` is passed, `/tmp/foo/bar` should be a directory, not `/tmp/foo`.
* Since `salt.modules.file.makedirs` was updated, `salt.states.file.append` needed to be updated to pass the proper directory to create.
* Minor formatting change
 2013-04-25 16:36:19 +01:00
Pedro Algarvio
2552f2cfc3 Join the processes in order to wait for them to finish. 2013-04-24 22:31:57 +01:00
Pedro Algarvio
7eed841ba6 Fix the salt.modules.hosts tests and even test if order is preserved when writing the new file. 2013-04-23 12:56:23 +01:00
Pedro Algarvio
eeda1698ff Simplify and fix tests for salt.modules.hosts. 2013-04-23 12:56:23 +01:00
Pedro Algarvio
b36747b084 pkg.expand_repo_def is allowed to fail on the sysmod integration tests. 2013-04-22 22:40:15 +01:00
Pedro Algarvio
50a12a13f5 kwargs should be passed as kwarg to client.cmd. 2013-04-22 22:04:33 +01:00
Pedro Algarvio
7836a26c97 Reduce timeout's by a third. 2013-04-22 19:39:02 +01:00
Denis Generalov
56f221018d * fix bt if environment empty or absent 
* fix tests
 2013-04-10 16:24:41 +04:00
Jason R. McNeil
b4b8c191e2 Darwin (OS X) sysctl support. 
I don't recall linux sysctl output being as messy as what I see on 10.8, so this module still needs some work I think to prevent it from choking on the odd output.
 2013-04-01 00:36:38 -07:00
Thomas S Hatch
a85d1d4da1 Add extra not to file path, another test is laying it down 
which was breaking this one
 2013-03-23 14:41:27 -06:00
Colton Myers
357b0596e2 Fix lambda (last time?) 
Apparently I have no idea what I'm doing.
 2013-03-21 16:50:28 -06:00
Colton Myers
f69e305df4 Fix it so we define patch correctly 
Must be a function that returns a function, so it works as a decorator
 2013-03-21 16:46:03 -06:00
Colton Myers
50084125be Can't use pass in lambdas 2013-03-21 16:35:34 -06:00
Colton Myers
93ef23f03c Make sure patch is defined (otherwise the decorator complains) 2013-03-21 16:32:09 -06:00
Colton Myers
9222114c2b Serious PEP8 and styling fixes 2013-03-21 16:22:29 -06:00
Colton Myers
adc5433174 Remove trailing whitespace and tabs 2013-03-21 16:15:26 -06:00
Colton Myers
cde87e8cd3 Wrap mock import in try-except, skip if not available 2013-03-21 16:13:53 -06:00
Jim Dalton
c774eccb1f Skip these tests if svn is not available. 2013-03-18 15:19:35 -07:00
Jim Dalton
316a7d9d2d Add tests for states.svn. Ensure svn.latest includes changes in return 2013-03-16 07:33:04 -07:00
Roberto Aguilar
9631a63cb6 Added show_diff kwarg to file.managed. 
This can be set on a per-file basis so that potentially-sensitive
content can be omitted from logs.
 2013-03-13 11:07:56 +00:00
Pedro Algarvio
a639b0f0e6 Merge branch 'develop' of github.com:saltstack/salt into hotfix/fix-travis-again 2013-03-13 01:32:49 +00:00
Pedro Algarvio
c0ead8b2dc Fix a misplaced continue on the grains matching logic which caused a traceback. 
```
[21:18:46,004 [salt.utils.minions                          :200 ][ERROR   ] Failed matching available minions with grain pattern: planets:saturn
Traceback (most recent call last):
  File "/home/ubuntu/salt/salt/utils/minions.py", line 197, in check_minions
      }[expr_form](expr)
        File "/home/ubuntu/salt/salt/utils/minions.py", line 119, in _check_grain_minions
    str(match.lower()),
    AttributeError: 'list' object has no attribute 'lower'
```
 2013-03-13 01:02:15 +00:00
Colton Myers
b473e6882f Remove empty group tests (you can't have a user in no groups) 2013-03-12 15:19:03 -06:00
Pedro Algarvio
e052116d32 Add back test_user_if_present_with_gid. 
Some systems have the nobody user with the nogroup instead of nobody as it's group.
 2013-03-12 07:22:52 +00:00
Thomas S Hatch
4720093d66 Remove faulty test 
Can't pass a group name in as the gid, a gid is required
 2013-03-12 00:11:48 -06:00
Thomas S Hatch
dbd0b386dc single quotes 2013-03-12 00:00:30 -06:00
Thomas S Hatch
a4ca7a5f6f Change to a symlink that does not exist 2013-03-11 23:44:31 -06:00
Thomas S Hatch
d70ecc8387 Update doc test to -d changes 2013-03-11 23:27:18 -06:00
Pedro Algarvio
acb866762e Fix expected comment in testcase states.pip.PipStateTest.test_pip_installed_weird_install. 2013-03-12 04:03:12 +00:00
Thomas S Hatch
0d8574344d stub out event fireing test until we can acertain what is wrong 
The events are getting cleanly fired, but the test is failing....
 2013-03-11 17:09:56 -06:00
Roberto Aguilar
37be12ed37 Updated environment test to use mock library. 2013-03-11 21:54:10 +00:00
Pedro Algarvio
cf75fc4ffb Fix the sysmod examples regular expression to accept both examples and Examples. 2013-03-09 16:07:19 +00:00
Jeroen Dekkers
b40242e409 Make ssh key regular expression more strict 2013-03-08 15:01:58 +01:00
Roberto Aguilar
f942ed6097 Added test for clean environment. 2013-03-02 23:04:04 -08:00
Pedro Algarvio
fc44fde3e3 Improve example matching. 2013-02-17 13:23:51 +00:00
Pedro Algarvio
94455dace6 Show useful information from the failing test. 2013-02-17 12:52:36 +00:00
Thomas S Hatch
f65626db0b Update pydsl tests, still failing though 2013-02-09 15:07:59 -07:00
Thomas S Hatch
68b5d29ea6 Get tests runnign until pydsl migration is complete 2013-02-08 13:21:35 -07:00
Thomas S Hatch
3719982399 stub out another event test that needs refinement 2013-02-08 13:14:45 -07:00
Thomas S Hatch
107b97e952 Add test to verify loader modules 2013-02-08 11:14:22 -07:00
Thomas S Hatch
3d006ddd1c Stub out unreliable event test until it can be stabalized 2013-02-08 11:07:40 -07:00
Thomas S Hatch
3d1cf71a77 Combine compound matcher tests 2013-02-08 10:57:20 -07:00
Colton Myers
bae02c930e Add None checks for eventfired in event.py 2013-02-07 17:51:32 -07:00
Thomas S Hatch
5b16fed6cc remove unused import 2013-02-07 17:39:20 -07:00
Thomas S Hatch
8fb36351b3 remove unused import 2013-02-07 17:38:36 -07:00
Thomas S Hatch
52be720d62 Remove unused grains lookup 2013-02-07 17:37:13 -07:00
Colton Myers
37b025490b Fix indent style issue 2013-02-07 17:31:10 -07:00
Colton Myers
53f1c86013 Add pip.py test for upgrading packages 2013-02-07 17:31:10 -07:00
Thomas S Hatch
c5f5bd1e99 Fix tests to better reflect doc matching updates 2013-02-07 15:11:42 -07:00
Thomas S Hatch
4ec6722103 revert cmd_yaml change that broke basic functionality 2013-02-06 13:03:34 -07:00
Thomas S Hatch
47e08fc4fa Remove failing test, I am not sure how it ever passed... 2013-02-06 12:48:33 -07:00
Pedro Algarvio
aa721e89cf Fix integration.shell.call.CallTest.test_default_output. 2013-02-06 05:13:39 +00:00
Denis Generalov
9325ec7bba Try to make some tests for sysctl module 2013-02-06 00:57:53 +04:00
Thomas S Hatch
a6df51ab1a Fix test failure due to update in the default nested outputter 2013-01-29 10:23:22 -07:00
Thomas S Hatch
a58202c2f7 Add compound matcher tests 2013-01-29 10:20:02 -07:00
Thomas S Hatch
dd28185763 Merge pull request #3459 from archtaku/tests 
Add tests for nested grain/pillar matching
 2013-01-25 22:24:42 -08:00
Erik Johnson
77eeb47bea Add tests for nested grain/pillar matching 
Also added tests for traditional grain matching when target grain is a
list.
 2013-01-26 00:13:51 -06:00
Thomas S Hatch
4c95f0e0ea fix #3449 2013-01-25 21:16:11 -07:00
Pedro Algarvio
eb38c4de5f Fix supervisor test. 2013-01-23 23:23:05 +00:00
Pedro Algarvio
34522907e8 One more grain.item fix to comply with new dict output. 2013-01-23 23:00:19 +00:00
Pedro Algarvio
0207416f3c Conform with the dict return type for 'salt.modules.grains.item'. 2013-01-23 22:51:45 +00:00
Thomas S Hatch
86ed822148 Single quotes 2013-01-19 18:22:54 -07:00
Thomas S Hatch
bbad93c386 Add skipif to a test that requires root 2013-01-17 13:29:49 -07:00
Pedro Algarvio
dcb8477f7d Fix phrasing. 2013-01-16 00:11:48 +00:00
Pedro Algarvio
d2f5461a09 Fix the test skip in case of a lower git describe parsed version info. 2013-01-16 00:02:20 +00:00
Pedro Algarvio
44b45ffa0c Too much spaces(PEP-8). 2013-01-15 22:55:20 +00:00
Pedro Algarvio
b1488b61c5 Fix integration.shell.key output tests. 2013-01-15 21:53:29 +00:00
Thomas S Hatch
603be37e2b Merge pull request #3280 from s0undt3ch/develop 
Several deprecation fixes, enhancements, clarifications, for 0.12
 2013-01-15 13:43:53 -08:00
Pedro Algarvio
b9afd32994 If the parsed version info is higher, then we're most likely about to release a new salt version. 2013-01-15 19:42:24 +00:00
Pedro Algarvio
4adaab4dce Update tests to the new deprecation message. 2013-01-15 19:42:01 +00:00
Pedro Algarvio
392bb8ce1d Remove the deprecation config tests. Lower the salt call's timeout to 30 secs. Refs #3271. 2013-01-15 19:19:57 +00:00
Pedro Algarvio
9e804add7a Simplify logic of getting the temporary directory. 2013-01-15 17:50:09 +00:00
Pedro Algarvio
d61ef51e7a Show why git describe failed on the tests. 2013-01-15 14:16:39 +00:00
Thomas S Hatch
89525ad6d0 remove pre 0.12.0 test handles 2013-01-15 00:10:19 -07:00
Thomas S Hatch
4617a931be Remove debugging pprint 2013-01-14 23:53:18 -07:00
Thomas S Hatch
1ddcd715fb Reached 0.12, fix outputter test 2013-01-14 23:40:20 -07:00
Thomas S Hatch
ad452f0b64 clean up stray prints 2013-01-14 23:08:36 -07:00
Thomas S Hatch
7c8ca7e1d6 remove recursive git test 
The problem here is that we will need to create a small static
git repo somewhere first, relying on the mozilla one causes
other tests to fail due to timeouts and makes the test run VERY
long
 2013-01-14 22:55:24 -07:00
Thomas S Hatch
2ca04f4671 Stop downloading giant git repos in the test suite 
THIS WAS NOT OK!!!
 2013-01-14 22:51:21 -07:00
Thomas S Hatch
a24ff1852a remove unused import 2013-01-14 21:50:56 -07:00
Pedro Algarvio
0bf51ba5b0 Allow a test to specify it's own run_function timeout. Increase timeout for some tests. 2013-01-14 14:07:58 +00:00
Pedro Algarvio
36955b4560 Fix integration.shell.matcher.MatchTest.test_ipcadr. 
Was skipping because of the latest output changes and how output parsing was done.
 2013-01-14 13:04:23 +00:00
Pedro Algarvio
2f3bb49f83 Fix getting the output of git describe into salt's version string. Added a test case for this too. 2013-01-14 12:35:42 +00:00
Pedro Algarvio
e9ca0a26d7 A little longer timeout. 2013-01-13 18:18:34 +00:00
Pedro Algarvio
3ff77c1958 Wait for the integration tests local client cmd's for, at most, 30 seconds. 2013-01-13 12:49:10 +00:00
Pedro Algarvio
633a313587 Lower integration tests local client timeout to 5 minutes. 2013-01-13 11:31:04 +00:00
Thomas S Hatch
bdae844eec fix outputter tests that come with changes in the default outputter 2013-01-13 00:01:30 -07:00
Pedro Algarvio
fd2739401c Adapt to the new local client events changes. Fixes #3214. 2013-01-11 19:03:53 +00:00
Pedro Algarvio
39f03c59cd The test suite local client now properly receives the events. Fixes #3214. 
* We were instantiating the integration testing local client too soon in the process. Deferring it to a little latter made it all work.
* Added the ability to dump the master and minion testing configurations to files. Just prepend the `runtests` call with `DUMP_SALT_CONFIG=1` and you'll get the computed configuration files in `/tmp/salttest/{master,minion}`.
* We now also un-subscribe from the event's once done.
* Added `salt.utils.event.LocalClientEvent` just to differentiate from `salt.utils.event.MasterEvent` in the logs so we know who's who. It's just a subclass of the latter.
 2013-01-11 16:21:04 +00:00
Thomas S Hatch
d95a8e612f clean up some double quotes 2013-01-10 00:25:02 -07:00
Jeff Schroeder
8b74360493 Skip the git state tests if a dns lookup to github.com fails 
This is the quickest clever thing I could think of while running the
unit tests offline in the car during a long road trip.
 2012-12-21 23:32:11 -06:00
Jeff Schroeder
4da4dc25a1 Skip the virtualenv state test if virtualenv isn't installed 2012-12-21 21:35:58 -06:00
Ryan Schneider
8f8cc74b34 Some minor cleanup of unit and integration tests. 2012-12-18 17:39:16 -08:00
Pedro Algarvio
ab74952a37 Since salt versioning changed, so should the depending deprecations. 
The are some output parser options which should be triggering warnings salt 0.10.6 and should start triggering failures when 0.10.7 came out. Adapt these dependable deprecations to the new versioning convention.
 2012-12-15 00:13:31 +00:00
Thomas S Hatch
aa1c55f610 Add tests for pillar matching list objects Fix #2761 2012-12-12 16:37:21 -07:00
Thomas S Hatch
f94637b4b4 Add a pilla rlist to test advanced pillar matching 2012-12-12 16:30:17 -07:00
David Boucha
6765a56032 Use TMP_STATE_TREE 2012-12-12 11:49:28 -07:00
David Boucha
dbc5d4ca9c Fixes #2594 Verify that changes in req file work 
After the first invocation of this venv, new additions to the
requirements.txt would not be honored.
 2012-12-12 11:49:28 -07:00
Pedro Algarvio
c0455f8fa9 Support creating state files at runtime. 
We now support runtime created files that can be used like `salt://my-temp-file.txt`.
Just make sure you write them to `os.path.join(integration.TMP_STATE_TREE, 'my-temp-file.txt')`.
 2012-12-12 18:38:39 +00:00
Pedro Algarvio
952779aa26 More code reuse in SaltReturnAssertsMixIn. 
The methods `assertSaltTrueReturn`, `assertSaltFalseReturn` and `assertSaltNoneReturn` now reuse the code from `__getWithinSaltReturn` making `__assertReturn` obsolete and for that removed.
 2012-12-12 17:11:44 +00:00
Pedro Algarvio
b9e72e7c3c Abstract SaltReturnAssertsMixIn to allow more tests using it. 
* Created a method which gets a deep keyed value in a salt state return. For example, allow getting, `ret['changes']['new']`.
* Created a method which tries to make sure the correct type of the passed keys for the above added method.
* Also added were the methods, `assertInSaltReturn`, `assertNotInSaltReturn`, `assertInSaltReturnRegexpMatches`, which simplified the existing `assertInSaltComment`, `assertNotInSaltComment`, `assertSaltCommentRegexpMatches`, `assertSaltStateChangesEqual` and `assertSaltStateChangesNotEqual`, also allowing to do similar tests in every key(deep or not) of a salt state return dictionary.
 2012-12-12 13:38:03 +00:00
Pedro Algarvio
7c6feb8c18 Fix a bug! It's basestring not string. 2012-12-12 00:33:54 +00:00
Ramón Cahenzli
a30f2ee244 This root or that root? :) 2012-12-11 16:37:30 +01:00
Pedro Algarvio
7c5a5d0bd3 Header updates. More copyright to the SaltSatck team. Code author to me(where applicable). 2012-12-11 10:23:37 +00:00
Pedro Algarvio
5ca7762784 Don't switch assertion case. Fix test. 2012-12-07 19:05:19 +00:00
Pedro Algarvio
871516b4cf Migrated test.integration.modules.state to use SaltReturnAssertsMixIn. 2012-12-07 18:44:06 +00:00
Pedro Algarvio
4348734697 Add integration.SaltReturnAssertsMixIn where it was lacking in previous commits. 2012-12-07 17:13:58 +00:00
Pedro Algarvio
0baa63c19f Remove deprecated tests functions. 
Removed `ModuleCase.assert_success()` and `ModuleCase.state_result()` which are now better tested using `SaltReturnAssertsMixIn`
 2012-12-07 17:09:11 +00:00
Pedro Algarvio
e03a2606a1 Migrated test.integration.states.supervisord to use SaltReturnAssertsMixIn. 2012-12-07 17:03:24 +00:00
Pedro Algarvio
cbea092b0c Migrated test.integration.states.rabbitmq_* to use SaltReturnAssertsMixIn. 2012-12-07 17:01:31 +00:00
Pedro Algarvio
fc3b272809 Migrated test.integration.states.pip to use SaltReturnAssertsMixIn. 
* Added `assertSaltCommentRegexpMatches()` to `SaltReturnAssertsMixIn` to add the ability to match salt comments using regular expressions.
 2012-12-07 16:59:24 +00:00
Pedro Algarvio
156ce07bde Migrated test.integration.states.host to use SaltReturnAssertsMixIn. 2012-12-07 16:35:20 +00:00
Pedro Algarvio
c1c3b31d0b Migrated test.integration.states.git to use SaltReturnAssertsMixIn. 2012-12-07 16:33:38 +00:00
Pedro Algarvio
b210d59eb8 Migrated test.integration.states.file to use SaltReturnAssertsMixIn. 2012-12-07 16:25:26 +00:00