[Cvsshell-devel] CVS: cvsshell/testing refstderr,1.1,1.2 refstdout,1.2,1.3 run-test.py,1.3,1.4 testi

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/cvsshell/cvsshell/testing
In directory usw-pr-cvs1:/tmp/cvs-serv5197/testing

Modified Files:
	refstderr refstdout run-test.py testinput 
Log Message:
added some testcases for the new functionality

Index: refstderr
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/testing/refstderr,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** refstderr	10 Mar 2002 23:13:01 -0000	1.1
--- refstderr	27 May 2002 06:40:38 -0000	1.2
***************
*** 12,18 ****
  cvs add: scheduling file `addtest2' for addition
  cvs add: use 'cvs commit' to add this file permanently
- cvs add: use 'cvs commit' to add these files permanently
  cvs remove: scheduling `test2' for removal
  cvs remove: use 'cvs commit' to remove this file permanently
  cvs remove: scheduling `addtest2' for removal
  cvs remove: use 'cvs commit' to remove this file permanently
--- 12,46 ----
  cvs add: scheduling file `addtest2' for addition
  cvs add: use 'cvs commit' to add this file permanently
  cvs remove: scheduling `test2' for removal
  cvs remove: use 'cvs commit' to remove this file permanently
  cvs remove: scheduling `addtest2' for removal
+ cvs remove: use 'cvs commit' to remove this file permanently
+ cvs add: scheduling file `/tmp/testdata/dirX/renamed' for addition
+ cvs add: use 'cvs commit' to add this file permanently
+ cvs remove: scheduling `/tmp/testdata/dirX/addtest3' for removal
+ cvs remove: use 'cvs commit' to remove this file permanently
+ cvs commit: Examining .
+ cvs commit: Examining dirX
+ cvs commit: Examining testdir
+ cvs add: scheduling file `renamed2' for addition
+ cvs add: use 'cvs commit' to add this file permanently
+ cvs remove: scheduling `/tmp/testdata/dirX/addtest4' for removal
+ cvs remove: use 'cvs commit' to remove this file permanently
+ cvs commit: Examining .
+ cvs commit: Examining dirX
+ cvs commit: Examining testdir
+ cvs add: scheduling file `/tmp/testdata//renamed3' for addition
+ cvs add: use 'cvs commit' to add this file permanently
+ cvs remove: scheduling `/tmp/testdata/test1' for removal
+ cvs remove: use 'cvs commit' to remove this file permanently
+ cvs commit: Examining .
+ cvs commit: Examining dirX
+ cvs commit: Examining testdir
+ cvs add: scheduling file `./renamed5' for addition
+ cvs add: use 'cvs commit' to add this file permanently
+ cvs remove: scheduling `renamed2' for removal
+ cvs remove: use 'cvs commit' to remove this file permanently
+ cvs add: scheduling file `renamed6' for addition
+ cvs add: use 'cvs commit' to add this file permanently
+ cvs remove: scheduling `renamed3' for removal
  cvs remove: use 'cvs commit' to remove this file permanently

Index: refstdout
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/testing/refstdout,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** refstdout	11 Mar 2002 12:02:15 -0000	1.2
--- refstdout	27 May 2002 06:40:38 -0000	1.3
***************
*** 2,8 ****
  ====== initializing the repository ======
  ====== importing the testdata ======
- N testdata/I_AM_HERE.pyc
  N testdata/test1
  N testdata/test2
  N testdata/testdir/test3

--- 2,8 ----
  ====== initializing the repository ======
  ====== importing the testdata ======
  N testdata/test1
  N testdata/test2
+ N testdata/I_AM_HERE.pyc
  N testdata/testdir/test3

***************
*** 14,242 ****
  === checkout 3 ===
  === checkout 4 ===
! ====== Testing commit ======
! === commit 1 ===
! Checking in test1;
! /tmp/cvsroot/testdata/test1,v  <--  test1
! new revision: 1.2; previous revision: 1.1
! done
! === commit 2 ===
! Checking in test1;
! /tmp/cvsroot/testdata/test1,v  <--  test1
! new revision: 1.3; previous revision: 1.2
! done
! ====== Testing add ======
! === add 1 ===
! RCS file: /tmp/cvsroot/testdata/addtest1,v
! done
! Checking in addtest1;
! /tmp/cvsroot/testdata/addtest1,v  <--  addtest1
! initial revision: 1.1
! done
! RCS file: /tmp/cvsroot/testdata/addtest2,v
! done
! Checking in addtest2;
! /tmp/cvsroot/testdata/addtest2,v  <--  addtest2
! initial revision: 1.1
! done
! RCS file: /tmp/cvsroot/testdata/dirX/addtest3,v
! done
! Checking in dirX/addtest3;
! /tmp/cvsroot/testdata/dirX/addtest3,v  <--  addtest3
! initial revision: 1.1
! done
! RCS file: /tmp/cvsroot/testdata/dirX/addtest4,v
! done
! Checking in dirX/addtest4;
! /tmp/cvsroot/testdata/dirX/addtest4,v  <--  addtest4
! initial revision: 1.1
! done
! CVS
! I_AM_HERE.pyc
! addtest1
! addtest2
! dirX
! test1
! test2
! testdir
! ====== Testing remove ======
! CVS
! I_AM_HERE.pyc
! addtest1
! dirX
! test1
! testdir
  Default global options:
! {'upd': '-q', 'up': '-q', 'update': '-q'}
  Default options:
! {'upd': '-P', 'up': '-P', 'update': '-P'}
  Default global options for all cmds:
  ''
  Default options for all cmds:
! '-z 3'
! CvsShell 0.1
  Copyright 2002 Stefan Heimann (ma...@st...).
  This software is released under the GPL.
  CvsShell started.
! {a} /private/tmp [--]
  $ cd /tmp
! {a} /private/tmp [--]
  $ echo ====== Creating testdata ========
! {a} /private/tmp [--]
  $ mkdir testdata
! {a} /private/tmp [--]
  $ cd testdata
! {a} /private/tmp/testdata [--]
  $ echo "You are file test1" > test1
! {a} /private/tmp/testdata [--]
  $ echo "You are file test2" > test2
! {a} /private/tmp/testdata [--]
  $ echo "You are a file that should by filtered" > I_AM_HERE.pyc
! {a} /private/tmp/testdata [--]
  $ mkdir testdir
! {a} /private/tmp/testdata [--]
  $ echo "You are file test3" > testdir/test3
! {a} /private/tmp/testdata [--]
  $ cd ..
! {a} /private/tmp [--]
! $ {a} /private/tmp [--]
  $ echo ====== initializing the repository ======
! {a} /private/tmp [--]
  $ cvs -d /tmp/cvsroot init
! {a} /private/tmp [--]
! $ {a} /private/tmp [--]
  $ echo ====== importing the testdata ======
! {a} /private/tmp [--]
  $ cd testdata
! {a} /private/tmp/testdata [--]
  $ cvs -d /tmp/cvsroot import -m "testdata" testdata stefan start
! {a} /private/tmp/testdata [--]
  $ cd ..
! {a} /private/tmp [--]
  $ rm -r testdata
! {a} /private/tmp [--]
! $ {a} /private/tmp [--]
  $ echo ====== testing checkout, set-root and clear-root ======
! {a} /private/tmp [--]
! $ {a} /private/tmp [--]
  $ echo === checkout 1 ===
! {a} /private/tmp [--]
! $ {a} /private/tmp [--]
  $ Aliases:
! enter new cvsroot: You can specify an alias for the cvsroot: enter name of module: cvs -z 3  -d /tmp/cvsroot  checkout    testdata
! {a} /private/tmp [/tmp/cvsroot]
! $ {a} /private/tmp [/tmp/cvsroot]
  $ cd testdata
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ cd ..
! {a} /private/tmp [/tmp/cvsroot]
  $ rm -r testdata
! {a} /private/tmp [/tmp/cvsroot]
! $ {a} /private/tmp [/tmp/cvsroot]
  $ echo === checkout 2 ===
! {a} /private/tmp [/tmp/cvsroot]
! $ enter name of module: cvs -z 3  -d /tmp/cvsroot  checkout    testdata
! {a} /private/tmp [/tmp/cvsroot]
  $ cd testdata
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ cd ..
! {a} /private/tmp [/tmp/cvsroot]
  $ rm -r testdata
! {a} /private/tmp [/tmp/cvsroot]
  $ echo === checkout 3 ===
! {a} /private/tmp [/tmp/cvsroot]
! $ cvs -z 3  -d /tmp/cvsroot  checkout    testdata
! {a} /private/tmp [/tmp/cvsroot]
  $ cd testdata
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ cd ..
! {a} /private/tmp [/tmp/cvsroot]
  $ rm -r testdata
! {a} /private/tmp [/tmp/cvsroot]
! $ {a} /private/tmp [--]
  $ echo === checkout 4 ===
! {a} /private/tmp [--]
! $ cvs -z 3  -d /tmp/cvsroot  checkout    testdata
! {a} /private/tmp [--]
  $ cd testdata
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo ====== Testing commit ======
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo === commit 1 ===
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo " changed" >> test1
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cvs -z 3 -q -d /tmp/cvsroot -n update  -P 
  :
!   0 M test1
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cd /private/tmp/testdata
! cvs -z 3  -d /tmp/cvsroot  commit   -m 'this file was changed for testing' test1
! cd /private/tmp/testdata
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo === commit 2 ===
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo " changed" >> test1
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cvs -z 3  -d /tmp/cvsroot  commit   -m 'this file was changed for testing' test1
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo ====== Testing add ======
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo === add 1 ===
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo "I am addtest1" > addtest1
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cvs -z 3  -d /tmp/cvsroot  add    addtest1

  The files have been scheduled for addition.
! Should I run `commit' to add the files to the repository (yes|no)? {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo "I am addtest2" > addtest2
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cvs -z 3 -q -d /tmp/cvsroot -n update  -P 
  :
!   0 A addtest1
!   1 ? addtest2
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cd /private/tmp/testdata
! cvs -z 3  -d /tmp/cvsroot  add   -m 'sdfasdf' addtest2 
  :
!   0 A addtest2
! 
  The files have been scheduled for addition.
! Should I run `commit' to add the files to the repository (yes|no)? {a} /private/tmp/testdata [/tmp/cvsroot]
  $ mkdir dirX
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo "I am addtest3" > dirX/addtest3
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo "I am addtest4" > dirX/addtest4
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cvs -z 3  -d /tmp/cvsroot -Q add   -m 'sdfa' dirX

  The files have been scheduled for addition.
! Should I run `commit' to add the files to the repository (yes|no)? {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cvs -z 3 -q -d /tmp/cvsroot  update  -P 
  :
!   0 A addtest1
!   1 A addtest2
! dirX:
!   2 ? addtest3
!   3 ? addtest4
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cd /private/tmp/testdata
! cvs -z 3  -d /tmp/cvsroot -Q add   -m 'sdfas' dirX/addtest3 dirX/addtest4 
  dirX:
!   0 A addtest3
!   1 A addtest4
! 
  The files have been scheduled for addition.
! Should I run `commit' to add the files to the repository (yes|no)? {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cd /private/tmp/testdata
! cvs -z 3  -d /tmp/cvsroot -Q commit   -m 'dummy'
! cd /private/tmp/testdata
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ ls 
! {a} /private/tmp/testdata [/tmp/cvsroot]
  $ echo ====== Testing remove ======
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cvs -z 3  -d /tmp/cvsroot  status    2>&1
  :
    0 Up-to-date addtest1
--- 14,294 ----
  === checkout 3 ===
  === checkout 4 ===
! registered command ['exit']
! registered command ['?', 'help']
! registered command ['cd']
! registered command ['up', 'upd', 'update']
! registered command ['refresh']
! registered command ['set-root']
! registered command ['read-root']
! registered command ['clear-root']
! registered command ['list']
! registered command ['ad', 'add', 'new']
! registered command ['add-bin']
! registered command ['ci', 'com', 'commit']
! registered command ['delete', 'remove']
! registered command ['rename']
! registered command ['co', 'get', 'checkout']
! registered command ['st', 'stat', 'status']
! registered command ['auto-root']
! registered command ['full-info']
! registered command ['auto-refresh']
  Default global options:
! {'up': '-q', 'upd': '-q', 'update': '-q'}
  Default options:
! {'up': '-P', 'upd': '-P', 'update': '-P'}
  Default global options for all cmds:
  ''
  Default options for all cmds:
! ''
! Aliases for cvsroots:
! {}
! Config options:
! {'color-updated': 'lblue', 'pager': 'more', 'color-patched': 'red', 'color-modified': 'green', 'color-added': 'purple', 'color-unknown': 'pink', 'colors': 'on', 'color-conflict': 'yellow', 'filter': '*.pyc *~', 'color-info': 'cyan'}
! Aliases:
! {'ls': 'ls --color=always'}
! CvsShell 0.2
  Copyright 2002 Stefan Heimann (ma...@st...).
  This software is released under the GPL.
  CvsShell started.
! [0m[36m{ar} /tmp [--][0m
  $ cd /tmp
! [0m[36m{ar} /tmp [--][0m
  $ echo ====== Creating testdata ========
! [0m[36m{ar} /tmp [--][0m
  $ mkdir testdata
! [0m[36m{ar} /tmp [--][0m
  $ cd testdata
! [0m[36m{ar} /tmp/testdata [--][0m
  $ echo "You are file test1" > test1
! [0m[36m{ar} /tmp/testdata [--][0m
  $ echo "You are file test2" > test2
! [0m[36m{ar} /tmp/testdata [--][0m
  $ echo "You are a file that should by filtered" > I_AM_HERE.pyc
! [0m[36m{ar} /tmp/testdata [--][0m
  $ mkdir testdir
! [0m[36m{ar} /tmp/testdata [--][0m
  $ echo "You are file test3" > testdir/test3
! [0m[36m{ar} /tmp/testdata [--][0m
  $ cd ..
! [0m[36m{ar} /tmp [--][0m
! $ [0m[36m{ar} /tmp [--][0m
  $ echo ====== initializing the repository ======
! [0m[36m{ar} /tmp [--][0m
  $ cvs -d /tmp/cvsroot init
! [0m[36m{ar} /tmp [--][0m
! $ [0m[36m{ar} /tmp [--][0m
  $ echo ====== importing the testdata ======
! [0m[36m{ar} /tmp [--][0m
  $ cd testdata
! [0m[36m{ar} /tmp/testdata [--][0m
  $ cvs -d /tmp/cvsroot import -m "testdata" testdata stefan start
! [0m[36m{ar} /tmp/testdata [--][0m
  $ cd ..
! [0m[36m{ar} /tmp [--][0m
  $ rm -r testdata
! [0m[36m{ar} /tmp [--][0m
! $ [0m[36m{ar} /tmp [--][0m
  $ echo ====== testing checkout, set-root and clear-root ======
! [0m[36m{ar} /tmp [--][0m
! $ [0m[36m{ar} /tmp [--][0m
  $ echo === checkout 1 ===
! [0m[36m{ar} /tmp [--][0m
! $ [0m[36m{ar} /tmp [--][0m
  $ Aliases:
! enter new cvsroot: You can specify an alias for the cvsroot: enter name of module: cvs   -d /tmp/cvsroot  checkout    testdata
! cvs  -q -d /tmp/cvsroot -n update  -P 
! No entries available.
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
! $ [0m[36m{ar} /tmp [/tmp/cvsroot][0m
  $ cd testdata
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ cd ..
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
  $ rm -r testdata
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
! $ [0m[36m{ar} /tmp [/tmp/cvsroot][0m
  $ echo === checkout 2 ===
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
! $ enter name of module: cvs   -d /tmp/cvsroot  checkout    testdata
! cvs  -q -d /tmp/cvsroot -n update  -P 
! No entries available.
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
  $ cd testdata
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ cd ..
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
  $ rm -r testdata
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
  $ echo === checkout 3 ===
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
! $ cvs   -d /tmp/cvsroot  checkout    testdata
! cvs  -q -d /tmp/cvsroot -n update  -P 
! No entries available.
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
  $ cd testdata
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ cd ..
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
  $ rm -r testdata
! [0m[36m{ar} /tmp [/tmp/cvsroot][0m
! $ [0m[36m{ar} /tmp [--][0m
  $ echo === checkout 4 ===
! [0m[36m{ar} /tmp [--][0m
! $ cvs   -d /tmp/cvsroot  checkout    testdata
! [0m[36m{ar} /tmp [--][0m
  $ cd testdata
! ====== Testing commit ======
! === commit 1 ===
! Checking in test1;
! /tmp/cvsroot/testdata/test1,v  <--  test1
! new revision: 1.2; previous revision: 1.1
! done
! === commit 2 ===
! Checking in test1;
! /tmp/cvsroot/testdata/test1,v  <--  test1
! new revision: 1.3; previous revision: 1.2
! done
! ====== Testing add ======
! === add 1 ===
! RCS file: /tmp/cvsroot/testdata/addtest1,v
! done
! Checking in addtest1;
! /tmp/cvsroot/testdata/addtest1,v  <--  addtest1
! initial revision: 1.1
! done
! RCS file: /tmp/cvsroot/testdata/addtest2,v
! done
! Checking in addtest2;
! /tmp/cvsroot/testdata/addtest2,v  <--  addtest2
! initial revision: 1.1
! done
! RCS file: /tmp/cvsroot/testdata/dirX/addtest3,v
! done
! Checking in dirX/addtest3;
! /tmp/cvsroot/testdata/dirX/addtest3,v  <--  addtest3
! initial revision: 1.1
! done
! RCS file: /tmp/cvsroot/testdata/dirX/addtest4,v
! done
! Checking in dirX/addtest4;
! /tmp/cvsroot/testdata/dirX/addtest4,v  <--  addtest4
! initial revision: 1.1
! done
! [00m[01;34mCVS[00m
! [00mI_AM_HERE.pyc[00m
! [00maddtest1[00m
! [00maddtest2[00m
! [01;34mdirX[00m
! [00mtest1[00m
! [00mtest2[00m
! [01;34mtestdir[00m
! [m====== Testing remove ======
! cvs  -q -d /tmp/cvsroot -n update  -P 
! No entries available.
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo ====== Testing commit ======
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo === commit 1 ===
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo " changed" >> test1
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs  -q -d /tmp/cvsroot -n update  -P 
! Root Directory: /tmp/testdata
  :
! [0m[32m  0 M test1
! [0m[0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cd /tmp/testdata
! cvs   -d /tmp/cvsroot  commit   -m 'this file was changed for testing' test1
! cd /tmp/testdata
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo === commit 2 ===
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo " changed" >> test1
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs   -d /tmp/cvsroot  commit   -m 'this file was changed for testing' test1
! cvs  -q -d /tmp/cvsroot -n update  -P 
! No entries available.
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo ====== Testing add ======
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo === add 1 ===
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo "I am addtest1" > addtest1
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs   -d /tmp/cvsroot  add    addtest1

  The files have been scheduled for addition.
! Should I run `commit' to add the files to the repository (yes|no)? cvs  -q -d /tmp/cvsroot -n update  -P 
! Root Directory: /tmp/testdata
! :
! [0m[35m  0 A addtest1
! [0m[0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo "I am addtest2" > addtest2
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs  -q -d /tmp/cvsroot -n update  -P 
! Root Directory: /tmp/testdata
  :
! [0m[35m  0 A addtest1
! [0m[0m[1;35m  1 ? addtest2
! [0m[0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cd /tmp/testdata
! cvs   -d /tmp/cvsroot  add   -m 'sdfasdf' addtest2 
! Root Directory: /tmp/testdata
  :
! [0m[35m  0 A addtest2
! [0m
  The files have been scheduled for addition.
! Should I run `commit' to add the files to the repository (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ mkdir dirX
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo "I am addtest3" > dirX/addtest3
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo "I am addtest4" > dirX/addtest4
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs   -d /tmp/cvsroot -Q add   -m 'sdfa' dirX

  The files have been scheduled for addition.
! Should I run `commit' to add the files to the repository (yes|no)? cvs  -q -d /tmp/cvsroot -n update  -P 
! Root Directory: /tmp/testdata
  :
! [0m[35m  0 A addtest1
! [0m[0m[35m  1 A addtest2
! [0mdirX:
! [0m[1;35m  2 ? addtest3
! [0m[0m[1;35m  3 ? addtest4
! [0m[0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs  -q -d /tmp/cvsroot  update  -P 
! Root Directory: /tmp/testdata
! :
! [0m[35m  0 A addtest1
! [0m[0m[35m  1 A addtest2
! [0mdirX:
! [0m[1;35m  2 ? addtest3
! [0m[0m[1;35m  3 ? addtest4
! [0m[0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cd /tmp/testdata
! cvs   -d /tmp/cvsroot -Q add   -m 'sdfas' dirX/addtest3 dirX/addtest4 
! Root Directory: /tmp/testdata
  dirX:
! [0m[35m  0 A addtest3
! [0m[0m[35m  1 A addtest4
! [0m
  The files have been scheduled for addition.
! Should I run `commit' to add the files to the repository (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ No files given. This will commit the whole directory
! tree starting from here. Answer `yes' if you want to do
! so, `no' to abort the operation or specify some files
! to operate on. cd /tmp/testdata
! cvs   -d /tmp/cvsroot -Q commit   -m 'dummy'
! cd /tmp/testdata
! cvs  -q -d /tmp/cvsroot -n update  -P 
! No entries available.
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ ls --color=always 
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ echo ====== Testing remove ======
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs   -d /tmp/cvsroot  status    2>&1
! Root Directory: /tmp/testdata
  :
    0 Up-to-date addtest1
***************
*** 249,273 ****
  testdir:
    6 Up-to-date test3
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ /private/tmp/testdata/test2
! cd /private/tmp/testdata
! cvs -z 3  -d /tmp/cvsroot  remove    test2
  :
    0 R test2

  The files have been scheduled for removal.
! Should I run `commit' to remove the files permanently (yes|no)? {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cvs -z 3  -d /tmp/cvsroot  remove    addtest2

  The files have been scheduled for removal.
! Should I run `commit' to remove the files permanently (yes|no)? {a} /private/tmp/testdata [/tmp/cvsroot]
! $ {a} /private/tmp/testdata [/tmp/cvsroot]
  $ Refusing the delete a directory: dirX
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ ls 
! {a} /private/tmp/testdata [/tmp/cvsroot]
! $ cd /Users/stefan
! {a} ~ [/tmp/cvsroot]
  $ rm -rf /tmp/testdata /tmp/cvsroot
! {a} ~ [/tmp/cvsroot]
  $ CvsShell done.
--- 301,483 ----
  testdir:
    6 Up-to-date test3
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ /tmp/testdata/test2
! [00m[01;34mCVS[00m
! [00mI_AM_HERE.pyc[00m
! [00maddtest1[00m
! [01;34mdirX[00m
! [00mtest1[00m
! [01;34mtestdir[00m
! [m====== Testing rename ====
! Removing addtest2;
! /tmp/cvsroot/testdata/addtest2,v  <--  addtest2
! new revision: delete; previous revision: 1.1
! done
! Removing test2;
! /tmp/cvsroot/testdata/test2,v  <--  test2
! new revision: delete; previous revision: 1.1.1.1
! done
! Removing dirX/addtest3;
! /tmp/cvsroot/testdata/dirX/addtest3,v  <--  addtest3
! new revision: delete; previous revision: 1.1
! done
! RCS file: /tmp/cvsroot/testdata/dirX/renamed,v
! done
! Checking in dirX/renamed;
! /tmp/cvsroot/testdata/dirX/renamed,v  <--  renamed
! initial revision: 1.1
! done
! RCS file: /tmp/cvsroot/testdata/renamed2,v
! done
! Checking in renamed2;
! /tmp/cvsroot/testdata/renamed2,v  <--  renamed2
! initial revision: 1.1
! done
! Removing dirX/addtest4;
! /tmp/cvsroot/testdata/dirX/addtest4,v  <--  addtest4
! new revision: delete; previous revision: 1.1
! done
! RCS file: /tmp/cvsroot/testdata/renamed3,v
! done
! Checking in renamed3;
! /tmp/cvsroot/testdata/renamed3,v  <--  renamed3
! initial revision: 1.1
! done
! Removing test1;
! /tmp/cvsroot/testdata/test1,v  <--  test1
! new revision: delete; previous revision: 1.3
! done
! cd /tmp/testdata
! cvs   -d /tmp/cvsroot  remove    test2
! Root Directory: /tmp/testdata
  :
    0 R test2

  The files have been scheduled for removal.
! Should I run `commit' to remove the files permanently (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs   -d /tmp/cvsroot  remove    addtest2

  The files have been scheduled for removal.
! Should I run `commit' to remove the files permanently (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ Refusing the delete a directory: dirX
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ ls --color=always 
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ echo ====== Testing rename ====
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs   -d /tmp/cvsroot  status    2>&1
! Root Directory: /tmp/testdata
! :
!   0 Up-to-date addtest1
!   1 Up-to-date test1
! dirX:
!   2 Up-to-date addtest3
!   3 Up-to-date addtest4
! testdir:
!   4 Up-to-date test3
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ Rename: /tmp/testdata/dirX/addtest3 => /tmp/testdata/dirX/renamed
! Are you sure (yes|no)? cd /tmp/testdata
! cvs   -d /tmp/cvsroot  add   /tmp/testdata/dirX/renamed
! cd /tmp/testdata
! cd /tmp/testdata
! cvs   -d /tmp/cvsroot  remove   /tmp/testdata/dirX/addtest3
! cd /tmp/testdata
! 
! The files have been scheduled for removal/addition.
! Should I run `commit' to remove/add the files permanently (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ No files given. This will commit the whole directory
! tree starting from here. Answer `yes' if you want to do
! so, `no' to abort the operation or specify some files
! to operate on. cd /tmp/testdata
! cvs   -d /tmp/cvsroot  commit   -m 'test'
! cd /tmp/testdata
! cvs  -q -d /tmp/cvsroot -n update  -P 
! No entries available.
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs   -d /tmp/cvsroot  status    2>&1
! Root Directory: /tmp/testdata
! :
!   0 Up-to-date addtest1
!   1 Up-to-date test1
! dirX:
!   2 Up-to-date addtest4
!   3 Up-to-date renamed
! testdir:
!   4 Up-to-date test3
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ enter filenumber/filename to rename: enter new filename: Rename: /tmp/testdata/dirX/addtest4 => renamed2
! Are you sure (yes|no)? cd /tmp/testdata
! cvs   -d /tmp/cvsroot  add   renamed2
! cd /tmp/testdata
! cd /tmp/testdata
! cvs   -d /tmp/cvsroot  remove   /tmp/testdata/dirX/addtest4
! cd /tmp/testdata
! 
! The files have been scheduled for removal/addition.
! Should I run `commit' to remove/add the files permanently (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ No files given. This will commit the whole directory
! tree starting from here. Answer `yes' if you want to do
! so, `no' to abort the operation or specify some files
! to operate on. cd /tmp/testdata
! cvs   -d /tmp/cvsroot  commit   -m 'test'
! cd /tmp/testdata
! cvs  -q -d /tmp/cvsroot -n update  -P 
! No entries available.
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ cvs   -d /tmp/cvsroot  status    2>&1
! Root Directory: /tmp/testdata
! :
!   0 Up-to-date addtest1
!   1 Up-to-date renamed2
!   2 Up-to-date test1
! dirX:
!   3 Up-to-date renamed
! testdir:
!   4 Up-to-date test3
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ enter new filename: Rename: /tmp/testdata/test1 => /tmp/testdata//renamed3
! Are you sure (yes|no)? cd /tmp/testdata
! cvs   -d /tmp/cvsroot  add   /tmp/testdata//renamed3
! cd /tmp/testdata
! cd /tmp/testdata
! cvs   -d /tmp/cvsroot  remove   /tmp/testdata/test1
! cd /tmp/testdata
! 
! The files have been scheduled for removal/addition.
! Should I run `commit' to remove/add the files permanently (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ No files given. This will commit the whole directory
! tree starting from here. Answer `yes' if you want to do
! so, `no' to abort the operation or specify some files
! to operate on. cd /tmp/testdata
! cvs   -d /tmp/cvsroot  commit   -m 'test'
! cd /tmp/testdata
! cvs  -q -d /tmp/cvsroot -n update  -P 
! No entries available.
! [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ Rename: renamed => ./renamed4
! Are you sure (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ enter new filename: Rename: renamed2 => ./renamed5
! Are you sure (yes|no)? cd .
! cvs   -d /tmp/cvsroot  add   ./renamed5
! cd /tmp/testdata
! cd .
! cvs   -d /tmp/cvsroot  remove   renamed2
! cd /tmp/testdata
! 
! The files have been scheduled for removal/addition.
! Should I run `commit' to remove/add the files permanently (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
! $ enter filenumber/filename to rename: enter new filename: Rename: renamed3 => renamed6
! Are you sure (yes|no)? cd .
! cvs   -d /tmp/cvsroot  add   renamed6
! cd /tmp/testdata
! cd .
! cvs   -d /tmp/cvsroot  remove   renamed3
! cd /tmp/testdata
! 
! The files have been scheduled for removal/addition.
! Should I run `commit' to remove/add the files permanently (yes|no)? [0m[36m{ar} /tmp/testdata [/tmp/cvsroot][0m
  $ rm -rf /tmp/testdata /tmp/cvsroot
! [0m[36m{ar} ERROR [/tmp/cvsroot][0m
  $ CvsShell done.

Index: run-test.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/testing/run-test.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** run-test.py	14 Mar 2002 18:45:47 -0000	1.3
--- run-test.py	27 May 2002 06:40:38 -0000	1.4
***************
*** 30,38 ****
      refstdout = thisDir + '/refstdout'
      refstderr = thisDir + '/refstderr'
      testcode = open(thisDir + '/testinput').read()
      os.system('rm -rf /tmp/testdata /tmp/cvsroot')  # little clean-up
      try:
!         os.unlink(os.path.join(os.environ['HOME'], '.cvsshellrc'))
!     except: pass
      os.chdir('/tmp')
      stdin, stdout, stderr = os.popen3('python %s/../src/cvs_shell.py -v' % thisDir)
--- 30,41 ----
      refstdout = thisDir + '/refstdout'
      refstderr = thisDir + '/refstderr'
+     savedRC = os.path.join(os.environ['HOME'], '.cvsshellrc-saved')
      testcode = open(thisDir + '/testinput').read()
      os.system('rm -rf /tmp/testdata /tmp/cvsroot')  # little clean-up
      try:
!         os.rename(os.path.join(os.environ['HOME'], '.cvsshellrc'), savedRC)
!         restoreRC = 1
!     except:
!         restoreRC = 0
      os.chdir('/tmp')
      stdin, stdout, stderr = os.popen3('python %s/../src/cvs_shell.py -v' % thisDir)
***************
*** 40,44 ****
--- 43,49 ----
      stdin.close()
      logstdout = tempfile.mktemp()
+     print 'logstdout: %s' % logstdout
      logstderr = tempfile.mktemp()
+     print 'logstderr: %s' % logstderr
      open(logstdout,'w').write(stdout.read())
      stdout.close()
***************
*** 57,63 ****
      a = raw_input('Should the result be saved as the new reference (yes|no)? ')
      if a == 'yes':
!         os.rename(logstdout, refstdout)
!         os.rename(logstderr, refstderr)
!     os.unlink(os.path.join(os.environ['HOME'], '.cvsshellrc'))

  if __name__ == '__main__':
--- 62,72 ----
      a = raw_input('Should the result be saved as the new reference (yes|no)? ')
      if a == 'yes':
!         os.system('mv %s %s' % (logstdout, refstdout))
!         os.system('mv %s %s' % (logstderr, refstderr))
!     if restoreRC:
!         try:
!             os.rename(savedRC,os.path.join(os.environ['HOME'], '.cvsshellrc'))
!         except OSError:
!             pass

  if __name__ == '__main__':

Index: testinput
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/testing/testinput,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testinput	11 Mar 2002 12:02:15 -0000	1.2
--- testinput	27 May 2002 06:40:38 -0000	1.3
***************
*** 73,76 ****
--- 73,77 ----
    n
  commit -Q -m 'dummy'
+   yes
  ls
  echo ====== Testing remove ======
***************
*** 83,87 ****
  remove dirX
  ls
! cd
  rm -rf /tmp/testdata /tmp/cvsroot
  exit
--- 84,120 ----
  remove dirX
  ls
! echo ====== Testing rename ====
! status
! rename 2 $OLD_DIR/renamed
!   yes
!   no
! commit -m 'test'
!   yes
! status
! rename
!   2
!   renamed2
!   yes
!   no
! commit -m 'test'
!   yes
! status
! rename 2
!   $OLD_DIR/renamed3
!   yes
!   no
! commit -m 'test'
!   yes
! rename renamed $OLD_DIR/renamed4
!   no
! rename renamed2
!   $OLD_DIR/renamed5
!   yes
!   no
! rename
!   renamed3
!   renamed6
!   yes
!   no
  rm -rf /tmp/testdata /tmp/cvsroot
  exit

[Cvsshell-devel] CVS: cvsshell/testing refstderr,1.1,1.2 refstdout,1.2,1.3 run-test.py,1.3,1.4 testi

[Cvsshell-devel] CVS: cvsshell/testing refstderr,1.1,1.2 refstdout,1.2,1.3 run-test.py,1.3,1.4 testinput,1.2,1.3