Patchwork [Bug,6480] New: test-convert-cvs assumes existence of "python"

login
register
mail settings
Submitter mercurial-bugs@mercurial-scm.org
Date Feb. 4, 2021, 11:13 p.m.
Message ID <bug-6480-285@https.bz.mercurial-scm.org/>
Download mbox | patch
Permalink /patch/48270/
State Not Applicable
Headers show

Comments

mercurial-bugs@mercurial-scm.org - Feb. 4, 2021, 11:13 p.m.
https://bz.mercurial-scm.org/show_bug.cgi?id=6480

            Bug ID: 6480
           Summary: test-convert-cvs assumes existence of "python"
           Product: Mercurial
           Version: 5.7
          Hardware: All
                OS: NetBSD
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla@mercurial-scm.org
          Reporter: tk@giga.or.at
                CC: mercurial-devel@mercurial-scm.org
    Python Version: ---

Not all packaging systems provide a "python" symlink to the python[23] to use.

This makes test-convert-cvs.t fail on pkgsrc systems, with:

+  cvschangesets hook: 0 changesets
   $ rm -rf transcoding-hg


I assume the second and third chunks are followup failures.

Patch

--- /scratch/devel/py-mercurial/work/mercurial-5.7/tests/test-convert-cvs.t     
+++ /scratch/devel/py-mercurial/work/mercurial-5.7/tests/test-convert-cvs.t.err 
@@ -615,9 +615,10 @@                                                             
   > @@                                                                         
   > ''').lstrip())                                                             
   > EOF                                                                        
+  $TESTTMP.sh: python: not found                                               
+  [127]                                                                        

   $ cvscall -q checkout transcoding                                            
-  U transcoding/file                                                           

 Test converting in normal case                                                 
 ------------------------------                                                 
@@ -625,18 +626,8 @@                                                             
 (filtering by grep in order to check only form of debug messages)              

   $ hg convert --config convert.cvsps.logencoding=utf-8,euc-jp,cp932 -q
--debug transcoding transcoding-hg | grep 'transcoding by'
-  transcoding by utf-8: 1.1 of file
-  transcoding by utf-8: 1.1.1.1 of file
-  transcoding by utf-8: 1.2 of file
-  transcoding by euc-jp: 1.3 of file
-  transcoding by cp932: 1.4 of file
+  [1]
   $ hg -R transcoding-hg --encoding utf-8 log -T "{rev}: {desc}\n"
-  5: update tags
-  4: import
-  3: \xe3\x81\x82 (cp932) (esc)
-  2: \xe3\x81\x82 (euc-jp) (esc)
-  1: \xe3\x81\x82 (utf-8) (esc)
-  0: Initial revision
   $ rm -rf transcoding-hg

 Test converting in error cases
@@ -645,15 +636,13 @@ 
 unknown encoding in convert.cvsps.logencoding

   $ hg convert --config convert.cvsps.logencoding=foobar -q transcoding
transcoding-hg
-  abort: unknown encoding: foobar
-  (check convert.cvsps.logencoding configuration)
-  [255]
+  cvslog hook: 0 entries
+  cvschangesets hook: 0 changesets
   $ rm -rf transcoding-hg

 no acceptable encoding in convert.cvsps.logencoding

   $ hg convert --config convert.cvsps.logencoding=utf-8,euc-jp -q transcoding
transcoding-hg
-  abort: no encoding can transcode CVS log message for 1.4 of file
-  (check convert.cvsps.logencoding configuration)
-  [255]
+  cvslog hook: 0 entries