Mike Place
a3b32bbc9e
Merge pull request #26413 from evverx/fix-start-restart-reload-and-force-reload
...
Fix service.{start,restart,reload,force-reload} for masked services
2015-08-18 08:16:15 -06:00
Erik Johnson
b7447fcadb
Fix git.clone tests to reflect new return data
2015-08-18 03:39:27 -05:00
Erik Johnson
8dc8eb4b41
Fix test_add_dir
...
Paths in the expected output needed to be relative, not full
2015-08-18 02:40:25 -05:00
Erik Johnson
7c9f2027f6
Remove usage of os.chdir except in setUp
...
Additionally, take measures to ensure that we chdir back to the original
cwd at the conclusion of the test.
A redundant test has also been removed, was likely a stray copypasta.
2015-08-18 02:15:21 -05:00
Erik Johnson
dd9bcc896e
Lint fixes
2015-08-17 22:10:39 -05:00
Erik Johnson
cc8a5b181e
Remove unit tests for git states
...
These need to be completely rewritten
2015-08-17 22:10:39 -05:00
Erik Johnson
294aad298e
Add proper tests for git execution module
2015-08-17 22:10:39 -05:00
Erik Johnson
94941fbed1
Remove git unit tests
...
These tests are useless, they assert true results while mocking
cmd.run_all to always return True with retcode 0. Nothing but a waste of
CPU cycles.
2015-08-17 22:10:33 -05:00
Evgeny Vereshchagin
31ac42cac3
Fix service.{start,restart,reload,force-reload} for masked services
2015-08-18 00:57:52 +00:00
Evgeny Vereshchagin
ab4d6e5323
Fix service.enable for masked services
2015-08-17 14:00:20 -06:00
Pedro Algarvio
a73ca74bc3
White-space lint fix
2015-08-17 15:28:22 +01:00
Pedro Algarvio
8f69530f65
Add the unit tests for Schema in a DictItem properties
2015-08-17 13:20:18 +01:00
Pedro Algarvio
fa826c9ba2
Add a validation test for DictItem required attribute validation
2015-08-17 13:58:22 +01:00
Pedro Algarvio
f74cc21d70
DictItem must also define it's require attribute
2015-08-17 13:56:00 +01:00
Pedro Algarvio
a0af17dbde
Double to single quotes
2015-08-17 13:54:12 +01:00
Justin Findlay
4cf9a16e63
Merge pull request #26224 from cachedout/fopen_2015_8
...
Cleanup of a few cases to move to salt.utils.fopen
2015-08-12 14:15:49 -06:00
Mike Place
35d6ae2be7
Use with
2015-08-12 12:14:12 -06:00
Nicole Thomas
6730990bbc
Merge pull request #26248 from nmadhok/vmware-cloud-test-2015.8
...
Initial commit of unit tests for vmware cloud driver
2015-08-12 10:59:15 -06:00
Colton Myers
1c661abc91
Skip failing event tests
...
@driskell it would be great if you could fix these up when you do your
2015.8 refactor
2015-08-12 10:15:11 -06:00
Nitin Madhok
fd7c365999
Lint Fix
2015-08-12 10:48:10 -04:00
Nitin Madhok
7c33f0ad54
Initial commit of unit tests for vmware cloud driver
2015-08-12 10:33:42 -04:00
Colton Myers
426b1631c6
Remove stray subscribe
2015-08-11 23:12:18 -06:00
Colton Myers
1502a39779
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
conf/minion
salt/client/__init__.py
salt/states/dockerio.py
salt/utils/event.py
tests/unit/utils/event_test.py
2015-08-11 18:12:21 -06:00
Mike Place
b5980ca54a
Migrate wtmp beacon to fopen
2015-08-11 15:57:04 -06:00
Mike Place
8ad37e0558
Remove debugger
2015-08-11 11:29:19 -06:00
Mike Place
05c21297de
Fix env ordering in merged list
2015-08-11 11:29:13 -06:00
Mike Place
8ca0e59891
Lint
2015-08-11 11:28:59 -06:00
Mike Place
cfb6982227
Adding some dictupdate merge tests
...
Add new option for top_file_merging_strategy to config
Add master config file option
Adding additional tests
Lexicographical test works
Make default strategy
Simplify to just an option about whether or not to merge
Changes
Implement ordered top files
Implement merge strategies and default top files
Lint
Doc rewrite and start on ordering
Remove debugging
Moving to env_order
Adding env_order
Still writing tests
More tests and docs
2015-08-11 11:28:40 -06:00
Colton Myers
49fb19049b
Remove outdated heavily-mocked unit test
2015-08-10 16:54:17 -06:00
Colton Myers
0fc16040d6
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/__init__.py
salt/cloud/clouds/vmware.py
salt/loader.py
salt/minion.py
salt/modules/archive.py
salt/modules/file.py
salt/states/pkg.py
salt/utils/http.py
2015-08-10 13:21:57 -06:00
Mike Place
f39780f8ce
Merge pull request #26000 from driskell/fix_discarded_events
...
Implement full event caching for subscribed tags
2015-08-10 12:57:17 -06:00
Mike Place
2704094e21
Merge pull request #26125 from evverx/timedatectl-settz
...
Use timedatectl set-timezone to tzsetting if available
2015-08-10 08:43:41 -06:00
Erik Johnson
56798d724c
Fix comment in return value
2015-08-09 22:07:02 -05:00
Erik Johnson
18ebdd382a
Update winrepo tests with new param names
2015-08-09 21:19:45 -05:00
Evgeny Vereshchagin
e5eaf4686a
Use timedatectl set-timezone to tzsetting
...
Fixed #26122
2015-08-09 06:00:35 +03:00
C. R. Oldham
28329fff55
These tests make no sense now that the proxy interface is module based and not object based.
2015-08-08 14:44:33 -06:00
Andreas Lutro
ceda2b7274
users: integration test for empty GECOS fields
2015-08-07 09:25:21 +02:00
Colton Myers
a4d4f8c5f8
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/linode.py
salt/modules/layman.py
salt/modules/win_system.py
2015-08-05 15:30:04 -06:00
Jason Woods
65acf975dd
Implement full event caching for subscribed tags
...
Require all multitasking contexts to subscribe to their events so one call to get_event for one tag does not discard events that should be saved for a subsequent call to get_event with another tag.
Use blocking get_event in batching with very small timeout.
Fixes #25998
2015-08-05 11:58:32 +01:00
twangboy
0502897635
Fixed the lint... again
2015-08-04 17:43:58 -06:00
twangboy
6f85d6b9af
Fixed some lint
2015-08-04 17:13:47 -06:00
Justin Findlay
9156bbd33e
update win_system exec mod unit tests
2015-08-04 15:55:32 -06:00
Mike Place
85f5e2a443
Fix failing tests
2015-08-04 09:48:43 -06:00
Dmitry Kuzmenko
5c6276ac7d
Subscribe event to bus is optional now
...
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
2015-08-03 16:10:38 -06:00
Colton Myers
4d8ba6b874
Remove reg unit tests, not applicable to latest version of reg module
2015-08-03 12:03:03 -06:00
Colton Myers
e29be766bb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/changelog
doc/man/salt.7
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/cloud/clouds/vmware.py
salt/config.py
salt/fileclient.py
salt/minion.py
salt/modules/chocolatey.py
salt/modules/localemod.py
salt/modules/pacman.py
salt/modules/pkgng.py
salt/modules/schedule.py
salt/modules/state.py
salt/modules/win_file.py
salt/modules/win_pkg.py
salt/state.py
salt/states/file.py
salt/utils/args.py
tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Thomas Jackson
fb4cdc475f
Keep track of SyncWrapper's IOLoop usage
...
While thinking through issues that might cause #25718 I ran into this case-- where you can create 2 sync wrappers with the same parent IOLoop and run into problems because you can't start/stop the loop multiple times like that and have the call tree work correctly. To solve this (since it *should* be the exceptional case) I'm making SyncWrapper keep track of which loops are in use-- then if someone attempts this situation it will simply make another one.
2015-07-29 08:48:33 -07:00
Thomas S Hatch
1fae76d53c
Merge pull request #25685 from twangboy/fix_25594
...
Fixed regex issues with comment and uncomment
2015-07-28 09:29:49 -06:00
twangboy
a904e8329b
Fixed another test failure...
2015-07-27 15:05:23 -06:00
David Boucha
f05ae95f9c
Merge pull request #25648 from twangboy/fix_25352
...
Clarified functionality of reg module, fixed state to work with new module
2015-07-27 13:30:33 -06:00