valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,814 Commits 24 Branches 182 Tags 341 MiB
1cf7737de4
Commit Graph

3728 Commits

Author SHA1 Message Date
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Thomas S Hatch
80a194bc20 Merge pull request #22401 from jfindlay/api_tests 
sort integration test minion return lists
 2015-04-07 09:15:44 -06:00
Thomas S Hatch
ebdf143c7e Merge pull request #22350 from jacksontj/2015.2 
2015.2: Fix batching
 2015-04-07 09:13:46 -06:00
Thomas S Hatch
234cb65a23 Merge pull request #22319 from plastikos/improvement-pillar_pcre 
Improvement: add pillar PCRE matching
 2015-04-07 09:09:49 -06:00
Justin Findlay
d640823767 Merge pull request #22407 from jayeshka/win_servermanager-unit-test 
adding win_servermanager unit test case.
 2015-04-07 08:40:33 -06:00
Mike Place
ea97a9e600 Merge pull request #22410 from jayeshka/smtp-unit-test 
adding smtp unit test case.
 2015-04-07 08:25:25 -06:00
Nicole Thomas
d06df7f1e9 Merge pull request #22405 from rahulhan/states_git_unit_test 
Adding git.py (states) unit tests
 2015-04-07 07:47:50 -06:00
Jayesh Kariya
605d4f3ea9 adding smtp unit test case. 2015-04-07 17:39:32 +05:30
Jayesh Kariya
a0cd8189de adding win_servermanager unit test case. 2015-04-07 15:44:24 +05:30
Rahul Handay
a807d2c55b Adding git.py (states) unit tests 2015-04-07 15:05:25 +05:30
Rahul Handay
7462556283 Adding win_path.py unit test cases 2015-04-07 14:16:45 +05:30
Justin Findlay
fceb83bf16 sort integration test minion return lists 2015-04-06 22:07:56 -06:00
Justin Findlay
56364ff571 adding cmd.run state integration tests 2015-04-06 20:32:22 -06:00
Thomas Jackson
5d8a4d7ab7 Add timeout to batch tests 2015-04-06 16:46:44 -07:00
Mike Place
ce0fb585de Merge pull request #22344 from jfindlay/bp-21652 
Backport #21652 from develop to 2015.2
 2015-04-06 11:25:26 -06:00
Mike Place
d8815c7dbc Merge pull request #22343 from jfindlay/shell_enabled_tests 
add shell {en|dis}abled tests for cmdline, templates
 2015-04-06 11:24:14 -06:00
Justin Findlay
54c83e3fe7 Merge pull request #22380 from jayeshka/win_ip-unit-test 
adding win_ip unit test case.
 2015-04-06 07:39:32 -06:00
Jayesh Kariya
6c7ed37c87 adding win_ip unit test case. 2015-04-06 15:35:01 +05:30
Rahul Handay
37731bbfdf Adding win_system unit test cases 2015-04-06 14:16:38 +05:30
Pedro Algarvio
ff4aa5b989 Include unless in the state internal keywords. 
Fixes #22359
 2015-04-05 01:00:08 +01:00
Thayne Harbaugh
a7a33b381c Various fixes: 
* Add missing spaces in help
   * Correct order of arguments to _check_cache_minions() (not part of pillar_pcre)
   * Add platening of pillar_pcre to pillar_exact_minions
   * Add missing match to pillar_pcre
   * Correct unit test
 2015-04-03 18:32:52 -06:00
Justin Findlay
fb8b1858a7 shell {en|dis}abled tests for cmdline, templates 2015-04-03 18:08:13 -06:00
Mike Place
f3df92834d More helper text, refactor filehandles, clean up 2015-04-03 15:34:47 -06:00
Mike Place
018400d94c Remove loop interval setting, was causing cpus to spin 2015-04-03 15:34:47 -06:00
Mike Place
275993ee18 Include parser option for --no-tests 2015-04-03 15:34:46 -06:00
Nicole Thomas
b23dd2234d Merge pull request #22315 from rahulhan/event_unit_test 
Adding states event.py unit tests
 2015-04-03 06:30:58 -06:00
Nicole Thomas
cd69833731 Merge pull request #22318 from jayeshka/twilio_notify-unit-test 
adding twilio_notify unit test case.
 2015-04-03 06:30:13 -06:00
Rahul Handay
a572f3cadc Adding nova.py unit tests 2015-04-03 14:40:46 +05:30
Jayesh Kariya
57925820ed adding twilio_notify unit test case. 2015-04-03 14:29:49 +05:30
Thayne Harbaugh
c91392bc91 Add option -J/--pillar-pcre to match on pillar PCREs 2015-04-03 02:47:19 -06:00
Rahul Handay
034386e855 Adding states event.py unit tests 2015-04-03 11:24:47 +05:30
Mike Place
5b6075c74c Merge pull request #22287 from jfindlay/debug_rest_tornado_test 
debug rest_tornado test error
 2015-04-02 09:22:14 -06:00
Justin Findlay
a927087f64 debug rest_tornado test error 2015-04-02 09:05:48 -06:00
Justin Findlay
e48df011fa adding alias state unit tests 2015-04-01 22:12:33 -06:00
Thomas S Hatch
8ec0c820a6 Merge pull request #22253 from rallytime/merge-22246 
Merge #22246 with pylint fix and test cleanup
 2015-04-01 13:03:27 -06:00
rallytime
7b859df4d1 Merge #22246 with pylint fix and test cleanup 
Refs #22246
 2015-04-01 10:29:23 -06:00
Thomas Jackson
d70e094183 Add initial tests for loader's public interfaces 
Tests for #22117
 2015-04-01 07:55:02 -07:00
Colton Myers
ed51f2bb7c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-31 11:25:27 -06:00
Thomas S Hatch
2b77267c4e Merge pull request #22091 from basepi/jinja.cmd.run 
[2015.2] Alias `cmd.run` to `cmd.shell` in templates (python_shell=True)
 2015-03-30 17:00:24 -06:00
Joshua Semar
a5b28ad24d fix tests return value 2015-03-30 16:42:19 -05:00
Joshua Semar
95aa3518d5 fix cas behavior on data module 
data.cas was not saving changes.  We now call dump after
receiving the change
 2015-03-30 16:01:28 -05:00
Colton Myers
0269f3d544 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-30 09:30:58 -06:00
Evan Borgstrom
181df2e489 Fix a bug with the implicit list handling in pyobjects requisites 
When specifying a requisite and you only need to list a single item you
can specify it without being wraped in a list and we will handle it
automatically.  This was being handled when we built our attrs to output
the final data, but this failed when you extended a require requisite
inside of a context manager.
 2015-03-27 21:04:00 -07:00
Colton Myers
c91a593507 Fix test to give more data on failure 2015-03-27 16:50:39 -06:00
Evan Borgstrom
247d38d1da This fixes #21796 
From the Python docs on the exec statement:

> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.

We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
 2015-03-21 08:03:12 -07:00
Evan Borgstrom
3223a15f83 This fixes #21796 
From the Python docs on the exec statement:

> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.

We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
 2015-03-21 07:58:14 -07:00
Colton Myers
18ab3f8275 Is it the underscore of doom? 2015-03-20 13:06:16 -06:00
Colton Myers
d89d8f5d2d Add the trailing slash 2015-03-20 11:55:45 -06:00
Colton Myers
4eee083691 Reorder mocked arguments 2015-03-20 10:36:25 -06:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
 2015-03-19 16:03:29 -06:00