[Piglit] [PATCH 4/4] gen_const_builtin_equal_tests.py: cleanup a few pylint errors

[Dylan Baker]

On Monday, May 19, 2014 17:54:28 Ilia Mirkin wrote:
> On Mon, May 19, 2014 at 5:43 PM, Dylan Baker <baker.dylan.c at gmail.com> wrote:
> > Signed-off-by: Dylan Baker <baker.dylan.c at gmail.com>
> > ---
> >  generated_tests/gen_const_builtin_equal_tests.py | 77 +++++++++---------------
> >  1 file changed, 29 insertions(+), 48 deletions(-)
> >
> > diff --git a/generated_tests/gen_const_builtin_equal_tests.py b/generated_tests/gen_const_builtin_equal_tests.py
> > index 79b5a1d..0e7543f 100644
> > --- a/generated_tests/gen_const_builtin_equal_tests.py
> > +++ b/generated_tests/gen_const_builtin_equal_tests.py
> > @@ -48,53 +48,34 @@ TEMPLATE = mako.template.Template(textwrap.dedent("""
> >      draw rect -1 -1 2 2
> >      probe all rgb 0.0 1.0 0.0"""))
> >
> > -test_vectors = [
> > -    [
> > -        "vec2(3.0, 3.14)",
> > -        "vec2(-6.0, 7.88)",
> > -        "bvec2(false, false)"
> > -        ],
> > -    [
> 
> I really like the visual separation between the different test cases
> here... what is it that pylint is complaining about? Just test_vectors
> vs TEST_VECTORS?
> 
> Perhaps a format more like
> 
> +    ["vec2(3.0, 3.14)",
> +     "vec2(-6.0, 7.88)",
> +     "bvec2(false, false)"
>        ],
> +    ["vec3(13.4, -0.9, 12.55)",
> +     "vec3(13.4, 12.0, -55.3)",
> +     "bvec3(true, false, false)"
>        ],
> 
> Would keep pylint happy while preserving the visual separation between
> the test cases?
> 
> > -        "vec3(13.4, -0.9, 12.55)",
> > -        "vec3(13.4, 12.0, -55.3)",
> > -        "bvec3(true, false, false)"

it complains about bad hanging indent, it wants the '],' to be dedented
which results in: 
	],
	[
		...
	],
	[

And that just adds a lot of white space. could we go to:
	[
		...],
	[
		...],

> > -        ],
> > -    [
> > -        "vec4(-2.0, 0.0, 0.123, -1000.5)",
> > -        "vec4(-2.4, 0.0, 0.456, 12.5)",
> > -        "bvec4(false, true, false, false)"
> > -        ],
> > -    [
> > -        "ivec2(-8, 12)",
> > -        "ivec2(-19, 12)",
> > -        "bvec2(false, true)"
> > -        ],
> > -    [
> > -        "ivec3(0, 8, 89)",
> > -        "ivec3(4, -7, 33)",
> > -        "bvec3(false, false, false)"
> > -        ],
> > -    [
> > -        "ivec4(11, 1000, 1, -18)",
> > -        "ivec4(55, 1000, -21, -17)",
> > -        "bvec4(false, true, false, false)"
> > -        ],
> > -    [
> > -        "bvec2(true, false)",
> > -        "bvec2(true, true)",
> > -        "bvec2(true, false)"
> > -        ],
> > -    [
> > -        "bvec3(false, true, false)",
> > -        "bvec3(false, false, true)",
> > -        "bvec3(true, false, false)"
> > -        ],
> > -    [
> > -        "bvec4(true, false, false, true)",
> > -        "bvec4(true, true, false, false)",
> > -        "bvec4(true, false, true, false)"
> > -        ]
> > -    ]
> > +TEST_VECTORS = [
> > +    ["vec2(3.0, 3.14)",
> > +     "vec2(-6.0, 7.88)",
> > +     "bvec2(false, false)"],
> > +    ["vec3(13.4, -0.9, 12.55)",
> > +     "vec3(13.4, 12.0, -55.3)",
> > +     "bvec3(true, false, false)"],
> > +    ["vec4(-2.0, 0.0, 0.123, -1000.5)",
> > +     "vec4(-2.4, 0.0, 0.456, 12.5)",
> > +     "bvec4(false, true, false, false)"],
> > +    ["ivec2(-8, 12)",
> > +     "ivec2(-19, 12)",
> > +     "bvec2(false, true)"],
> > +    ["ivec3(0, 8, 89)",
> > +     "ivec3(4, -7, 33)",
> > +     "bvec3(false, false, false)"],
> > +    ["ivec4(11, 1000, 1, -18)",
> > +     "ivec4(55, 1000, -21, -17)",
> > +     "bvec4(false, true, false, false)"],
> > +    ["bvec2(true, false)",
> > +     "bvec2(true, true)",
> > +     "bvec2(true, false)"],
> > +    ["bvec3(false, true, false)",
> > +     "bvec3(false, false, true)",
> > +     "bvec3(true, false, false)"],
> > +    ["bvec4(true, false, false, true)",
> > +     "bvec4(true, true, false, false)",
> > +     "bvec4(true, false, true, false)"]]
> >
> >
> >  def main():
> > @@ -104,7 +85,7 @@ def main():
> >      except OSError:
> >          pass
> >
> > -    for test_id, x in enumerate(test_vectors, 2):
> > +    for test_id, x in enumerate(TEST_VECTORS, 2):
> >          # make equal tests
> >          name = ("spec/glsl-1.20/execution/built-in-functions/"
> >                  "glsl-const-builtin-equal-{0:02d}.shader_test".format(test_id))
> > --
> > 2.0.0.rc2
> >
> > _______________________________________________
> > Piglit mailing list
> > Piglit at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/piglit

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20140519/d8be9b03/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20140519/d8be9b03/attachment-0001.sig>