Patchwork [STABLE] test: do not add .pyc and .orig in test-commit-amend.t (issue4085)

login
register
mail settings
Submitter Pierre-Yves David
Date Nov. 5, 2013, 10:01 a.m.
Message ID <0151b61fed976372a4c2.1383645680@yamac.lan>
Download mbox | patch
Permalink /patch/2861/
State Accepted
Commit 0151b61fed976372a4c26e6a3f09794ff87087b0
Headers show

Comments

Pierre-Yves David - Nov. 5, 2013, 10:01 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1383645345 -3600
#      Tue Nov 05 10:55:45 2013 +0100
# Branch stable
# Node ID 0151b61fed976372a4c26e6a3f09794ff87087b0
# Parent  d24ee6d7d16730efe4b0894e0cb7c3e931411963
test: do not add .pyc and .orig in test-commit-amend.t (issue4085)

This makes the test fails with disabled byte-compilation
(PYTHONDONTWRITEBYTECODE="1" environmental variable).
Augie Fackler - Nov. 5, 2013, 6:13 p.m.
On Tue, Nov 05, 2013 at 11:01:20AM +0100, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
> # Date 1383645345 -3600
> #      Tue Nov 05 10:55:45 2013 +0100
> # Branch stable
> # Node ID 0151b61fed976372a4c26e6a3f09794ff87087b0
> # Parent  d24ee6d7d16730efe4b0894e0cb7c3e931411963
> test: do not add .pyc and .orig in test-commit-amend.t (issue4085)

queued, thanks

>
> This makes the test fails with disabled byte-compilation
> (PYTHONDONTWRITEBYTECODE="1" environmental variable).
>
> diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
> --- a/tests/test-commit-amend.t
> +++ b/tests/test-commit-amend.t
> @@ -748,14 +748,12 @@ This shouldn't be possible:
>
>    $ hg up -q default
>    $ hg branch closewithamend
>    marked working directory as branch closewithamend
>    (branches are permanent and global, did you want a bookmark?)
> -  $ hg ci -Am..
> -  adding cc.orig
> -  adding obs.py
> -  adding obs.pyc
> +  $ hg add obs.py
> +  $ hg ci -m..
>    $ hg ci --amend --close-branch -m 'closing'
>    abort: can only close branch heads
>    [255]
>
>  This silliness fails:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -748,14 +748,12 @@  This shouldn't be possible:
 
   $ hg up -q default
   $ hg branch closewithamend
   marked working directory as branch closewithamend
   (branches are permanent and global, did you want a bookmark?)
-  $ hg ci -Am..
-  adding cc.orig
-  adding obs.py
-  adding obs.pyc
+  $ hg add obs.py
+  $ hg ci -m..
   $ hg ci --amend --close-branch -m 'closing'
   abort: can only close branch heads
   [255]
 
 This silliness fails: