Patchwork [2,of,2,v2] tests: enforce use of $PYTHON in tests

login
register
mail settings
Submitter Augie Fackler
Date June 20, 2017, 2:47 a.m.
Message ID <e1f993b7b7c22ff5d776.1497926838@imladris.local>
Download mbox | patch
Permalink /patch/21519/
State Changes Requested
Headers show

Comments

Augie Fackler - June 20, 2017, 2:47 a.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1497550959 14400
#      Thu Jun 15 14:22:39 2017 -0400
# Node ID e1f993b7b7c22ff5d7769e76642ba6a0ceedc06a
# Parent  d73d16aa95377376830b01f31ce6fb84c4fc5cbf
tests: enforce use of $PYTHON in tests
Yuya Nishihara - June 20, 2017, 12:05 p.m.
On Mon, 19 Jun 2017 22:47:18 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1497550959 14400
> #      Thu Jun 15 14:22:39 2017 -0400
> # Node ID e1f993b7b7c22ff5d7769e76642ba6a0ceedc06a
> # Parent  d73d16aa95377376830b01f31ce6fb84c4fc5cbf
> tests: enforce use of $PYTHON in tests
> 
> diff --git a/tests/test-check-shbang.t b/tests/test-check-shbang.t
> --- a/tests/test-check-shbang.t
> +++ b/tests/test-check-shbang.t
> @@ -5,9 +5,21 @@
>  
>  look for python scripts that do not use /usr/bin/env
>  
> -  $ hg files 'set:grep(r"^#!.*?python") and not grep(r"^#!/usr/bi{1}n/env python")'
> +  $ hg files 'set:grep(r"^#!.*?python") and not grep(r"^#!/usr/bi{1}n/env python") - **/*.t'
>    [1]
>  
> +In tests, enforce $PYTHON and *not* /usr/bin/env python or similar:
> +  $ hg files 'set:grep(r"#!.*?python") and **/*.t' \
> +  > -X tests/test-check-execute.t \
> +  > -X tests/test-check-module-imports.t \
> +  > -X tests/test-check-pyflakes.t \
> +  > -X tests/test-check-shbang.t
> +  [1]

I got tests/test-merge-symlinks.t here. No idea why you wouldn't see it.
Augie Fackler - June 20, 2017, 1:49 p.m.
> On Jun 20, 2017, at 08:05, Yuya Nishihara <yuya@tcha.org> wrote:
> 
> On Mon, 19 Jun 2017 22:47:18 -0400, Augie Fackler wrote:
>> # HG changeset patch
>> # User Augie Fackler <augie@google.com>
>> # Date 1497550959 14400
>> #      Thu Jun 15 14:22:39 2017 -0400
>> # Node ID e1f993b7b7c22ff5d7769e76642ba6a0ceedc06a
>> # Parent  d73d16aa95377376830b01f31ce6fb84c4fc5cbf
>> tests: enforce use of $PYTHON in tests
>> 
>> diff --git a/tests/test-check-shbang.t b/tests/test-check-shbang.t
>> --- a/tests/test-check-shbang.t
>> +++ b/tests/test-check-shbang.t
>> @@ -5,9 +5,21 @@
>> 
>> look for python scripts that do not use /usr/bin/env
>> 
>> -  $ hg files 'set:grep(r"^#!.*?python") and not grep(r"^#!/usr/bi{1}n/env python")'
>> +  $ hg files 'set:grep(r"^#!.*?python") and not grep(r"^#!/usr/bi{1}n/env python") - **/*.t'
>>   [1]
>> 
>> +In tests, enforce $PYTHON and *not* /usr/bin/env python or similar:
>> +  $ hg files 'set:grep(r"#!.*?python") and **/*.t' \
>> +  > -X tests/test-check-execute.t \
>> +  > -X tests/test-check-module-imports.t \
>> +  > -X tests/test-check-pyflakes.t \
>> +  > -X tests/test-check-shbang.t
>> +  [1]
> 
> I got tests/test-merge-symlinks.t here. No idea why you wouldn't see it.

I think it might have gotten touched since I did the initial cleanup. It'll be fixed in v3. Thanks!

Patch

diff --git a/tests/test-check-shbang.t b/tests/test-check-shbang.t
--- a/tests/test-check-shbang.t
+++ b/tests/test-check-shbang.t
@@ -5,9 +5,21 @@ 
 
 look for python scripts that do not use /usr/bin/env
 
-  $ hg files 'set:grep(r"^#!.*?python") and not grep(r"^#!/usr/bi{1}n/env python")'
+  $ hg files 'set:grep(r"^#!.*?python") and not grep(r"^#!/usr/bi{1}n/env python") - **/*.t'
   [1]
 
+In tests, enforce $PYTHON and *not* /usr/bin/env python or similar:
+  $ hg files 'set:grep(r"#!.*?python") and **/*.t' \
+  > -X tests/test-check-execute.t \
+  > -X tests/test-check-module-imports.t \
+  > -X tests/test-check-pyflakes.t \
+  > -X tests/test-check-shbang.t
+  [1]
+
+The above exclusions are because they're looking for files that
+contain Python but don't end in .py - please avoid adding more.
+
+
 look for shell scripts that do not use /bin/sh
 
   $ hg files 'set:grep(r"^#!.*/bi{1}n/sh") and not grep(r"^#!/bi{1}n/sh")'