[Cvsshell-devel] CVS: cvsshell/testing testcases.py,1.2,1.3

[Stefan H. <ste...@us...>]

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

Modified Files:
	testcases.py 
Log Message:
adapt testcase because of some changes in basic_cmds.


Index: testcases.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/testing/testcases.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testcases.py	4 Aug 2002 17:30:13 -0000	1.2
--- testcases.py	7 Aug 2002 22:17:12 -0000	1.3
***************
*** 106,113 ****
          self.exe('refresh')
          self.assertEntries([(Entry.S_UNKNOWN, 'new', '.'),
-                             (Entry.S_DELETED, 'deleted', '.'),
                              (Entry.S_MODIFIED, 'modified', '.'),
                              (Entry.S_OK, 'not_modified', '.'),
!                             (Entry.S_OK, 'sample_dir', '.')])
          self.assertPathEqual(workingDir, self.cvsshell.listing.rootDir)
          self.assertPathEqual(workingDir, os.getcwd())
--- 106,113 ----
          self.exe('refresh')
          self.assertEntries([(Entry.S_UNKNOWN, 'new', '.'),
                              (Entry.S_MODIFIED, 'modified', '.'),
                              (Entry.S_OK, 'not_modified', '.'),
!                             (Entry.S_OK, 'sample_dir', '.'),
!                             ('locally-deleted', 'deleted', '.')])
          self.assertPathEqual(workingDir, self.cvsshell.listing.rootDir)
          self.assertPathEqual(workingDir, os.getcwd())
***************
*** 120,126 ****
          self.assert_(self.cvsshell.listing is not None)
          self.assertEntries([(Entry.S_UNKNOWN, 'new', '.'),
-                             (Entry.S_DELETED, 'deleted', '.'),
                              (Entry.S_MODIFIED, 'modified', '.'),
!                             (Entry.S_OK, 'not_modified', '.')])
          self.assertPathEqual(os.path.join(workingDir, 'sample_dir'), self.cvsshell.listing.rootDir)
          self.assertPathEqual(workingDir, os.getcwd())
--- 120,126 ----
          self.assert_(self.cvsshell.listing is not None)
          self.assertEntries([(Entry.S_UNKNOWN, 'new', '.'),
                              (Entry.S_MODIFIED, 'modified', '.'),
!                             (Entry.S_OK, 'not_modified', '.'),
!                             ('locally-deleted', 'deleted', '.')])
          self.assertPathEqual(os.path.join(workingDir, 'sample_dir'), self.cvsshell.listing.rootDir)
          self.assertPathEqual(workingDir, os.getcwd())
***************
*** 132,143 ****
          self.exe('refresh -r')
          self.assertEntries([(Entry.S_UNKNOWN, 'new', '.'),
-                             (Entry.S_DELETED, 'deleted', '.'),
                              (Entry.S_MODIFIED, 'modified', '.'),
                              (Entry.S_OK, 'not_modified', '.'),
                              (Entry.S_OK, 'sample_dir', '.'),
                              (Entry.S_UNKNOWN, 'new', './sample_dir'),
-                             (Entry.S_DELETED, 'deleted', './sample_dir'),
                              (Entry.S_MODIFIED, 'modified', './sample_dir'),
!                             (Entry.S_OK, 'not_modified', './sample_dir')])
          self.assertPathEqual(workingDir, self.cvsshell.listing.rootDir)
          self.assertPathEqual(workingDir, os.getcwd())
--- 132,143 ----
          self.exe('refresh -r')
          self.assertEntries([(Entry.S_UNKNOWN, 'new', '.'),
                              (Entry.S_MODIFIED, 'modified', '.'),
                              (Entry.S_OK, 'not_modified', '.'),
                              (Entry.S_OK, 'sample_dir', '.'),
+                             ('locally-deleted', 'deleted', '.'),
                              (Entry.S_UNKNOWN, 'new', './sample_dir'),
                              (Entry.S_MODIFIED, 'modified', './sample_dir'),
!                             (Entry.S_OK, 'not_modified', './sample_dir'),
!                             ('locally-deleted', 'deleted', './sample_dir')])
          self.assertPathEqual(workingDir, self.cvsshell.listing.rootDir)
          self.assertPathEqual(workingDir, os.getcwd())
***************
*** 154,160 ****
          self.exe('refresh')
          if withParen:
!             self.exe('rm [[0,2]]')
          else:
!             self.exe('rm 0,2')
          self.assert_(not os.path.exists(new))
          self.assert_(not os.path.exists(mod))
--- 154,160 ----
          self.exe('refresh')
          if withParen:
!             self.exe('rm [[0,1]]')
          else:
!             self.exe('rm 0,1')
          self.assert_(not os.path.exists(new))
          self.assert_(not os.path.exists(mod))
***************
*** 170,174 ****
          self.assert_(os.path.exists(sdir))
          self.exe('refresh')
!         self.exe('rm -r [[4]]')
          self.assert_(not os.path.exists(sdir))
  
--- 170,174 ----
          self.assert_(os.path.exists(sdir))
          self.exe('refresh')
!         self.exe('rm -r [[3]]')
          self.assert_(not os.path.exists(sdir))
  
***************
*** 178,182 ****
      savedHistory = os.path.join(os.environ['HOME'], '.cvsshell_history-saved')
      history = os.path.join(os.environ['HOME'], '.cvsshell_history')
!     try: os.rename(history, savedHistory)
      except: pass
      try:
--- 178,183 ----
      savedHistory = os.path.join(os.environ['HOME'], '.cvsshell_history-saved')
      history = os.path.join(os.environ['HOME'], '.cvsshell_history')
!     try:
!         os.rename(history, savedHistory)
      except: pass
      try:
***************
*** 185,191 ****
      except:
          restoreRC = 0
!     import profile
!     import pstats
!     unittest.main()
      try:
          os.unlink(history)
--- 186,193 ----
      except:
          restoreRC = 0
!     try:
!         unittest.main()
!     except:
!         pass
      try:
          os.unlink(history)