Commit Graph

4258 Commits

Author SHA1 Message Date
Thomas S Hatch
26fee96834 Merge branch 'committerparser' of https://github.com/cro/salt into cro-committerparser 2015-03-10 10:10:28 -06:00
Nicole Thomas
827541ef3a Merge pull request #21469 from vdesjardins/develop
fixes #20198: virt.get_graphics and virt.get_nics calls in module virt
2015-03-10 09:16:49 -06:00
Jayesh Kariya
625b3f48f0 adding znc unit test 2015-03-10 10:36:10 +05:30
Vincent Desjardins
7e517a6a5a fixes #20198: virt.get_graphics and virt.get_nics calls in module virt 2015-03-09 22:10:38 -04:00
C. R. Oldham
f587330576 Moar Python3 compatibility. 2015-03-09 17:16:47 -06:00
C. R. Oldham
ea70e82edf Add statistics by committer by month, from future import 2015-03-09 17:00:56 -06:00
Justin Findlay
7a49e3e877 fix test lint 2015-03-09 16:00:10 -06:00
C. R. Oldham
b95e5cd706 Add simple parser to return some activity numbers from our git log. 2015-03-09 15:57:30 -06:00
Justin Findlay
2c04a36efa fix iptables tests 2015-03-09 15:09:55 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
Thomas S Hatch
268ee22d92 Merge pull request #21314 from arthurlogilab/postgresql
[modules/postgresql] modules for cluster management in postgresql (debian specific)
2015-03-09 11:09:56 -06:00
Thomas S Hatch
0da8878b90 lint 2015-03-09 11:02:25 -06:00
Thomas S Hatch
d789f263c4 Merge branch 'cloud-gce-tests' of https://github.com/junckritter/salt into junckritter-cloud-gce-tests 2015-03-09 11:00:10 -06:00
jfindlay
7ed498d3bf Merge pull request #21420 from jayeshka/win_useradd-unit-test
win_useradd unit test case
2015-03-09 10:03:25 -06:00
Jayesh Kariya
15b295ef95 removed second pylint error 2015-03-09 15:12:56 +05:30
Jayesh Kariya
529a57ebcb removed pylint error 2015-03-09 14:48:49 +05:30
Tomas Sirny
daf06c1ab6 Credit for test 2015-03-09 09:38:29 +01:00
Jayesh Kariya
51f00580f1 win_useradd unit test case 2015-03-09 14:08:05 +05:30
Jayesh Kariya
f167fafc12 pkgutil unit test case 2015-03-09 13:16:45 +05:30
Tomas Sirny
494d7069fd Working basic test for GCE cloud provider 2015-03-08 23:16:36 +01:00
Tomas Sirny
ee00477bae Template configs for GCE cloud provider 2015-03-08 16:44:14 +01:00
Thomas Jackson
7a5ac0245d Pylint fix 2015-03-06 17:47:18 -08:00
Nicole Thomas
5ba6437c89 Merge pull request #21324 from rallytime/pylint_develop
Some pylint 3 compatibility fixes for develop
2015-03-06 10:52:31 -07:00
Mathieu Le Marec - Pasquet
5f4905da62 fix tests 2015-03-06 17:13:31 +01:00
Mathieu Le Marec - Pasquet
f1111bd238 lint 2015-03-06 16:20:17 +01:00
Thomas Jackson
9fa37fd46b Add raw boolean support to depends decorator 2015-03-05 21:59:10 -08:00
Ross Perkins
3cf3ccfa8a Fix module: composer.install so it doesn't care what kind of output is returned by composer, and it relies exclusively on the return code instead.
Add module: composer.update
Add module: composer.selfupdate
Fix state: composer.installed to support test mode
Add state: composer.update
Updated tests.
2015-03-05 19:20:52 +01:00
rallytime
d9d30cc855 Pylint fix 2015-03-05 10:31:13 -07:00
rallytime
dbdc12fe11 Python 3 compat for joyent integration test file 2015-03-04 16:11:45 -07:00
Arthur Lutz
592e0a1402 [modules/postgresql] modules for cluster management in postgresql (debian specific)
related to  #21293
2015-03-04 18:33:20 +01:00
Justin Findlay
cfd03959d5 fix develop lint 2015-03-03 23:28:56 -07:00
Erik Johnson
0a077c14e3 Update test_valid_docs for nspawn compatibility funcs 2015-03-03 10:10:50 -07:00
Thomas S Hatch
17a76a8e86 Merge pull request #21083 from cachedout/request_test
Fix error in state.request
2015-03-03 10:00:14 -07:00
Jayesh Kariya
323c195bcc adding win_timezone unit test case 2015-03-03 18:46:53 +05:30
C. R. Oldham
f171df4311 Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060 Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07:00
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
Erik Johnson
5573b18624 Fix more py3-incompatible print statements 2015-02-28 12:15:16 -06:00
Erik Johnson
93e1805c14 Lint fix 2015-02-28 12:13:41 -06:00
Erik Johnson
84de5b23af Merge pull request #21160 from terminalmage/lint-2015.2
Don't use print statement without parenthesis (py3 compat)
2015-02-28 11:49:13 -06:00
Erik Johnson
afb8439c1f update test_valid_docs 2015-02-28 11:47:12 -06:00
Erik Johnson
86937eedc4 Don't use print statement without parenthesis (py3 compat)
This backports a lint fix from #21158 into the tests for 2015.2.
2015-02-28 11:41:51 -06:00
C. R. Oldham
1ff3192c20 Fileserver lists return lists 2015-02-27 17:24:25 -07:00
Justin Findlay
17b8f73f1b add cmd module integration tests 2015-02-27 16:30:05 -07:00
Justin Findlay
3397dc5540 fix state request tests 2015-02-27 16:15:26 -07:00
rallytime
b01196e7e8 Add transport key to mocked opts to fix batch unit tests 2015-02-27 14:53:58 -07:00
Mike Place
14592ed1f9 Adjust batch test 2015-02-27 14:53:58 -07:00
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