Commit Graph

977 Commits

Author SHA1 Message Date
Pedro Algarvio
be6814fe52 Added support for __main__ execution and formatting fixes. 2013-06-28 00:12:57 +01:00
Pedro Algarvio
2453535d9f Added support for __main__ execution and formatting fixes. 2013-06-28 00:12:57 +01:00
Pedro Algarvio
b0d9cf18c2 Added support for __main__ execution and formatting fixes. 2013-06-28 00:12:57 +01:00
Pedro Algarvio
663f54ef9f Update copyright years of changed files. Added __main__ execution to tests/integration/states/pip.py. 2013-06-28 00:12:57 +01:00
Pedro Algarvio
0a9f157262 Update sys.path before import salt. This way salt does not need to be installed. 2013-06-28 00:12:57 +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
Pedro Algarvio
be54a503d9 Adapted code fix sys.path in case called from __main__. Adapted to salt-testing. 2013-06-28 00:12:56 +01:00
Pedro Algarvio
860f74847e Remove the now unnecessary saltunittest. Moved remaining functionality to integration. 2013-06-28 00:12:56 +01:00
Pedro Algarvio
d4fd1baa2f Adapted the tests suite to work with salt-testing 2013-06-28 00:12:56 +01:00
Pedro Algarvio
576a5a4b78 Some more sysmod testing improvements. 2013-06-27 23:15:36 +01:00
Pedro Algarvio
276858d619 Improve sys.list_functions tests. 2013-06-27 23:00:55 +01:00
ZHANG Cheng
c86564abb1 Fix typo 2013-06-22 23:31:37 +08:00
Thomas S Hatch
3e3cb44acf Merge pull request #5651 from s0undt3ch/issues/5639-hosts
Single entry per line in the hosts file. Fixes #5639
2013-06-20 11:08:36 -07:00
Pedro Algarvio
4040d83d79 Single entry per line in the hosts file. Fixes #5639 2013-06-20 18:29:21 +01:00
Thomas S Hatch
e2d7f21034 @jacksont, please take a look at these, they are failing sometimes 2013-06-20 11:22:59 -06:00
Thomas S Hatch
ec2ab4d5d3 Fix up tests for decorators 2013-06-20 11:21:56 -06:00
Thomas S Hatch
3e7be2bfb4 Add os import to grains tests 2013-06-19 22:45:26 -06:00
Thomas S Hatch
e037283488 Ignore the grains setval test in travis because travis can't keep up 2013-06-19 22:28:53 -06:00
Thomas S Hatch
e30ce41d7a we are far enough removed to not need to test version deps here 2013-06-19 12:43:27 -06:00
Thomas S Hatch
86afd5356c disable faulty djangomod test 2013-06-19 00:35:08 -06:00
Thomas S Hatch
e59a646afa Need to find a way to only bump this up on travis.... 2013-06-19 00:32:08 -06:00
Thomas S Hatch
982df86d6b disable svn tests
These tests are causing problems since the svn repos are not always
returning the same data
2013-06-19 00:24:16 -06:00
Thomas S Hatch
862112c5a6 Fix error created by yaml changes 2013-06-18 23:51:44 -06:00
Thomas S Hatch
17f292a21a Add ignores for loaded depends modules
@jacksont, just fyi, we check the loaded modules for docstrings
2013-06-18 16:38:42 -06:00
Thomas S Hatch
e0c10755b9 Some cleaning of quotes and prints 2013-06-18 16:11:36 -06:00
Thomas S Hatch
86db665d2d kill the print 2013-06-18 15:45:50 -06:00
Thomas S Hatch
535d0a00e3 Finish #5585 2013-06-17 13:05:08 -06:00
ZHANG Cheng
c8aee0451d Make it possible to run a single unit test 2013-06-17 23:38:13 +08:00
Filip Noetzel
f40c2c5204 Fix django tests 2013-06-17 15:49:15 +02:00
Thomas Jackson
3016999c04 Adding "Depends" decorator to salt.utils
The Depends decorator allows you to optionally remove functions if sepecific globals/modules don't exist. This is particuarly helpful in larger scale deployments where some functions of the module work everywhere, but others require (for example) a service to be installed. This way you can avoid having to try/except all over the module to only load certain functions etc.
2013-06-14 15:17:06 -07:00
Thomas S Hatch
f5d4f31952 Doh! node 2013-06-11 16:39:48 -06:00
Thomas S Hatch
fe23e66ce5 Update eventlisten script with sock_dir changes 2013-06-11 16:37:16 -06:00
Thomas S Hatch
36bf8122e9 Merge branch 'timeout-for-run-command' of git://github.com/hulu/salt into hulu-timeout-for-run-command
Conflicts:
	salt/states/cmd.py
2013-06-11 16:30:41 -06:00
Andrew Noyes
c6fd91a8a8 Add timeout to salt.state.cmd.* functions
Add ability to specify timeouts for arbitrary commands.
If timeout is reached, subprocess is sent sigterm, and later sigkill
if it still exists. Issue #5322
2013-06-11 11:41:42 -07:00
Thomas S Hatch
6ae08e504f Merge pull request #5479 from cfra/directory-clean
Improve file.directory for clean=True
2013-06-11 09:46:06 -07:00
Thomas S Hatch
2218dd95a5 Add parse req failure state 2013-06-10 23:00:48 -06:00
Thomas S Hatch
dad4b18c93 Add overstate to check parse failures in requisites 2013-06-10 23:00:22 -06:00
Thomas S Hatch
815cb47a36 Add sls that will fail to parse 2013-06-10 23:00:02 -06:00
Thomas S Hatch
9752b21343 Add tests for overstate requisites 2013-06-10 18:42:54 -06:00
Thomas S Hatch
e228768961 Add overstate to test requisites 2013-06-10 18:42:54 -06:00
Thomas S Hatch
1bcca1aae3 Add a generic failing sls for tests 2013-06-10 18:42:54 -06:00
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
Thomas S Hatch
f92ceca7b8 Merge pull request #5385 from hulu/del-is-not-a-func
rm unnecessary parens around 'del'; it's not a function
2013-06-04 08:25:24 -07:00
Chris Rebert
31e5c275c5 rm unnecessary parens around 'del'; it's not a function 2013-06-03 11:53:04 -07:00
Chris Rebert
a6a356a3e4 runtests.py: use except-as syntax 2013-06-03 11:45:44 -06:00
Pedro Algarvio
8938b93b3f Run our own API based coverage 2013-06-02 09:07:39 +01:00
Pedro Algarvio
a61273bd71 Finally working. Cleaning up. 2013-05-31 12:48:53 +01:00
Pedro Algarvio
662f5b23ca Output the coverage pickled data. 2013-05-31 12:48:53 +01:00
Pedro Algarvio
63859e2915 Even more info from travis env. 2013-05-31 12:48:53 +01:00
Pedro Algarvio
51460af985 Fix SyntaxError. 2013-05-31 12:48:53 +01:00
Pedro Algarvio
5ec8147fbb Add the .coveragerc file and some debugging output to see if the coverage file is generated. 2013-05-31 12:48:52 +01:00
Pedro Algarvio
852e38658b Let's know where(CWD) is the suite running from. 2013-05-31 12:48:52 +01: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
Thomas S Hatch
90c5cc8c4d list_, not _list 2013-05-28 23:54:38 -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
95780ff219 Fix ref no non func alias in rvm test 2013-05-28 14:53:40 -06:00
Thomas S Hatch
8d018e0b8c make gem test ref non func alias 2013-05-28 14:35:26 -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
25fd45a688 Make --name a little more clear 2013-05-26 00:08:52 -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
Matt George
ecdff63b6e added ability to activate a virtualenv before
running pip install
2013-05-17 13:56:09 -05:00
Sylvain Fankhauser
101b9d2f2e Rename build_whitepace_splited_regex to build_whitespace_split_regex 2013-05-15 12:48:08 +02:00
Thomas S Hatch
f1697aea5b Fix test where the absence of mock breaks things 2013-05-07 22:42:08 -06: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
Thomas S Hatch
6d6daa00ec Merge pull request #4832 from 11craft/4805-pip-no-chown
Introduce `no_chown` option to pip-related functions
2013-05-07 09:56:36 -07:00
Daniel Watkins
7e7bf244c7 Move caching of requirements to helper function and add unit tests. 2013-05-07 10:20:56 +01: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
Thomas S Hatch
1427ef1f81 Merge pull request #4816 from hulu/except-as-tests
standardize to modern 'except FooError as err:' syntax in test files
2013-05-03 21:56:19 -07:00
Chris Rebert
c487d86fff tests: standardize to modern 'except FooError as err:' syntax 2013-05-03 19:55:50 -07:00
Chris Rebert
c7ff123a0f use genexpr & list comp in minionswarm test 2013-05-03 19:45:19 -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
Thomas S Hatch
829b2ca993 sort directory data to ensure consistent data set 2013-05-02 23:23:22 -06:00
Thomas S Hatch
f65515d57c Fix safe_walk test 2013-05-02 23:07:06 -06:00
Daniel Miller
b5d130cc3a Fix symlink recursion in salt.utils.safe_walk 2013-05-02 13:32:21 -04:00
Chris Rebert
498d2999db more typo fixes 2013-05-01 16:52:52 -07:00
Chris Rebert
26209c1fc1 rm unused imports reported by pyflakes 2013-04-30 14:48:04 -07:00
Chris Rebert
9ed364980d is not 0 => != 0 2013-04-30 10:32:21 -07:00
Thomas S Hatch
ab5f540430 Merge pull request #4232 from tohojo/ipv6-support
IPv6 support for master-minion communication
2013-04-28 18:34:28 -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
Pedro Algarvio
b88d901b78 Allow the event listener to work with the test sockets. And even for the minion's 2013-04-27 20:39:33 +01:00
Thomas S Hatch
cebdf76f2e Fix publish tests 2013-04-27 12:59:34 -06:00
Pedro Algarvio
a43e0132f1 Improve logging logic in salt/template.py. Allow the test suite to set more logging levels. 2013-04-27 09:56:24 +01: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
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
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
0d5c3b5f0c Add cmd.run_all to __salt__. Required for the unit test. 2013-04-22 22:26:05 +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
Pedro Algarvio
7e0b13a493 Include the filesystem cleanup options group into the parser. 2013-04-19 22:36:02 +01:00
Seth House
2facccd849 Fixed double dashes in default minion swarm names 2013-04-14 17:05:43 -06:00
Thomas S Hatch
8ac95960b3 Add name option to minionswarm so many hosts can check in 2013-04-11 15:36:28 -06:00
Denis Generalov
56f221018d * fix bt if environment empty or absent
* fix tests
2013-04-10 16:24:41 +04:00
Denis Generalov
1b1a5bd743 fix unit tests 2013-04-05 18:21:33 +04:00
G.Tjebbes
60af610e3f Ref #4361 : add some unit tests on pip's args 2013-04-03 23:41:17 +02: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
Toke Høiland-Jørgensen
5b6e17474b IPv6 address literals should be specified without brackets in config files. 2013-03-23 23:57:23 +01:00
Toke Høiland-Jørgensen
0f0a7cf560 Add a unit test for passing IPv6-formatted addresses to verify_socket. 2013-03-23 23:34:47 +01: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
e277154c18 Fix patch.multiple (wrong order on function defs) 2013-03-21 17:26:12 -06:00
Colton Myers
99d0a34dc2 Define patch.multiple 2013-03-21 17:21:26 -06:00
Colton Myers
d42e9d8b63 Wrap extra Mock() references 2013-03-21 17:09:16 -06:00
Colton Myers
7d6c2ffcd3 Add skipIf decorator 2013-03-21 17:00:53 -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
46f6145310 Remove trailing whitespace and fix PEP8 issues 2013-03-21 16:49:41 -06:00
Colton Myers
d3314e231b Wrap mock import to avoid ImportErrors 2013-03-21 16:48:18 -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
Roberto Aguilar
f3b46d7460 Fixed tabs 2013-03-12 11:20:54 -07:00
Roberto Aguilar
18ba416554 Added default runas for postgres functions.
On BSD the default runas user is pgsql, on other systems it's postgres.
2013-03-12 18:10:46 +00: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