Pedro Algarvio
8a938c9a66
Workaround the stateconf TypeError exceptions under python 2.6
...
```python
Traceback (most recent call last):
File "/testing/tests/unit/stateconf_test.py", line 117, in test_state_prefix
''', sls='test')
File "/testing/tests/unit/stateconf_test.py", line 30, in render_sls
**kws.copy()
File "/testing/salt/renderers/stateconf.py", line 229, in render
data = process_sls_data(sls_templ, tmplctx)
File "/testing/salt/renderers/stateconf.py", line 114, in process_sls_data
argline=rt_argline.strip(), **kws
File "/testing/salt/renderers/jinja.py", line 41, in render
tmp_data.get('data', 'Unknown render error in jinja renderer')
SaltRenderError: Traceback (most recent call last):
File "/testing/salt/utils/templates.py", line 64, in render_tmpl
output = render_str(tmplstr, context, tmplpath)
File "/testing/salt/utils/templates.py", line 102, in render_jinja_tmpl
loader = JinjaSaltCacheLoader(opts, context['env'])
File "/testing/salt/utils/jinja.py", line 42, in __init__
self.searchpath = opts['file_roots'][env]
TypeError: list indices must be integers, not str
```
2013-08-12 13:55:03 +01:00
Pedro Algarvio
799ff82f02
The test case should be executed in the test virtualenv for proper cleanup.
2013-08-12 13:36:52 +01:00
Pedro Algarvio
11060c85be
Allow running a group of tests while still providing a test case name from another group.
2013-08-12 11:46:58 +01:00
Erik Johnson
8aef9bc770
Merge pull request #6635 from terminalmage/docs
...
Formatting fixes
2013-08-11 20:21:03 -07:00
Erik Johnson
9c63495e04
Formatting fixes
...
This completes the documentation audit begun in cf365f7
2013-08-11 22:17:47 -05:00
Thomas S Hatch
96118db7a3
Merge pull request #6634 from UtahDave/develop
...
Add 0.16.3 Windows installer and doc links.
2013-08-11 17:15:26 -07:00
David Boucha
18d574f269
Add link to amd64 installer. Fix version #s
2013-08-11 18:02:51 -06:00
David Boucha
70a3827273
Add win32 installer link to docs
2013-08-11 18:02:05 -06:00
David Boucha
21b6f8790f
Bump minion version number.
2013-08-11 18:01:21 -06:00
Thomas S Hatch
13f441ece3
Merge pull request #6631 from hulu/pep8-E203-compliance
...
comply w/ pep8 E203+E241 (aligning operators w/ whitespace)
2013-08-11 11:53:45 -07:00
Pedro Algarvio
bbb8099c20
Fix my mistake of merging too soon.
2013-08-11 19:26:21 +01:00
Pedro Algarvio
0c9ed627ff
If no output, it's also a failure.
2013-08-11 19:22:30 +01:00
Pedro Algarvio
0d61701349
Merge pull request #6633 from techhat/bluetooth
...
Add hciconfig block and unblock to bluez
2013-08-11 11:03:04 -07:00
Joseph Hall
d446701e6b
Add hciconfig block and unblock to bluez
2013-08-11 10:25:31 -06:00
Pedro Algarvio
864a69661e
Match test suite exit code.
2013-08-11 17:20:43 +01:00
Pedro Algarvio
16f0b85b15
--output-format=parseable is deprecated. Adapt.
2013-08-11 15:07:08 +01:00
Pedro Algarvio
cd6a1753d7
Add a Jenkins specific pylintrc which can be used by the violations plugin.
2013-08-11 14:53:43 +01:00
Pedro Algarvio
67a5138a9d
Stream jenkins output.
2013-08-11 13:58:42 +01:00
Pedro Algarvio
e902d7c403
Required options should error if not passed.
2013-08-11 12:44:54 +01:00
Chris Rebert
29bf3cf226
comply w/ pep8 E203 & E241
...
i.e. (whitespace before ':') & (multiple spaces after ':')
2013-08-11 03:14:07 -07:00
Pedro Algarvio
1f2b9c7c3e
Merge pull request #6630 from cvrebert/patch-1
...
bridge mod: rm unused exception vars
2013-08-11 02:54:06 -07:00
Chris Rebert
386171e5db
bridge mod: rm unused exception vars
2013-08-11 02:41:33 -07:00
Pedro Algarvio
97be67ce9c
Merge pull request #6629 from hulu/weird-func-param-parenthesizing
...
change unusual function definition style that pep8 flags
2013-08-11 02:17:55 -07:00
Pedro Algarvio
d6945bdb49
Merge pull request #6627 from hulu/pep8-indents
...
pep8 indentation adjustments that agree w/ Salt style guide
2013-08-11 02:17:14 -07:00
Chris Rebert
d33dba90a0
change unusual function definition style that pep8 flags
2013-08-11 01:13:13 -07:00
Chris Rebert
39298e2256
pep8 indentation adjustments that agree w/ Salt style guide
2013-08-11 00:51:33 -07:00
David Boucha
c72336e043
Merge pull request #6626 from hulu/rh_ip-copyedit
...
some copyedits to rh_ip module
2013-08-11 00:23:44 -07:00
David Boucha
d23b8ec1ed
Merge pull request #6625 from hulu/pep8-W391-blank-line-at-EOF
...
rm blank lines at EOFs per pep8 W391
2013-08-11 00:21:49 -07:00
Chris Rebert
c3a14c1ab8
some copyedits to rh_ip module
2013-08-11 00:21:07 -07:00
Chris Rebert
e0be1ba54f
rm blank lines at EOFs per pep8 W391
2013-08-11 00:19:36 -07:00
Pedro Algarvio
d8dbafe60c
Merge pull request #6624 from hulu/fix-False-checks
...
X == True/False ==> X is True/False; per pep8
2013-08-11 00:14:00 -07:00
David Boucha
c7c2f40c80
Merge pull request #6620 from hulu/pep8-don-quixote
...
assorted PEP 8 fixes; mostly inline whitespace
2013-08-11 00:03:51 -07:00
Chris Rebert
c6b664ca66
X == True/False ==> X is True/False; per pep8
2013-08-10 23:57:11 -07:00
David Boucha
2dce396cfb
Merge pull request #6623 from hulu/pep8-don-quixote-2
...
inline whitespace fixes to comply w/ PEP 8
2013-08-10 23:55:34 -07:00
David Boucha
0f56545581
Merge pull request #6622 from iquaba/simple_loop
...
simplify loop
2013-08-10 23:53:35 -07:00
Chris Rebert
a3c1c064a8
inline whitespace fixes to comply w/ PEP 8
2013-08-10 23:50:25 -07:00
David Boucha
99b07b0fcf
Merge pull request #6621 from hulu/win_dns_client
...
win_dns_client: copyediting; spaces around operator
2013-08-10 23:44:52 -07:00
iquaba
820d63e091
simplify loop
2013-08-11 01:40:42 -05:00
Chris Rebert
0dd6966a4f
win_dns_client: copyediting; spaces around operator
2013-08-10 23:40:23 -07:00
Chris Rebert
0fa77c66eb
assorted PEP 8 fixes; mostly inline whitespace
2013-08-10 23:34:26 -07:00
David Boucha
bd6530b74c
Merge pull request #6618 from hulu/copyedits
...
Some docs copyediting & formatting
2013-08-10 23:02:41 -07:00
Thomas S Hatch
165de0bf8f
Merge pull request #6619 from cvrebert/patch-1
...
tests/jenkins.py: fix URL; minor copyedits
2013-08-10 23:00:06 -07:00
Chris Rebert
24e903e63a
tests/jenkins.py: fix URL; minor copyedits
2013-08-10 22:50:47 -07:00
David Boucha
b63a80d510
Merge pull request #6616 from iquaba/windows_hosts_file
...
Adds Windows minion id guessing based on 'hosts' file
2013-08-10 22:44:52 -07:00
Chris Rebert
25ff009ee9
Some docs copyediting & formatting
2013-08-10 22:43:12 -07:00
iquaba
854a798741
simplified loop
2013-08-11 00:40:50 -05:00
Thomas S Hatch
c4e71ed5d9
inheriting from old style class...
2013-08-10 23:30:45 -06:00
Thomas S Hatch
7f1c120666
more whitespace
2013-08-10 23:26:48 -06:00
Thomas S Hatch
9d5e167f99
Add super call to yumpkg
2013-08-10 23:26:37 -06:00
Thomas S Hatch
1b88d147c3
new style class
2013-08-10 23:18:06 -06:00
