floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r60277] triggered by https://codespeak.net/issue/py-dev/issue66 

* check for 1.5 messages for non-versioned resources
* modify non-recursive commit test to account for subversion
  behaviour changes (non-recursive commit on directory
  will now commit modified files in it, but will not recurse
  or add subdirs)

--HG--
branch : trunk
This commit is contained in:
hpk 2008-12-02 11:08:51 +01:00
parent 6ec13a2b9c
commit 6863f54951
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
py/path/svn/testing/test_wccommand.py
View File

@ -366,22 +366,21 @@ class TestWCSvnCommandPath(CommonSvnTests):
def test_commit_nonrecursive(self): def test_commit_nonrecursive(self):
root = self.root root = self.root
somedir = root.join('sampledir') somedir = root.join('sampledir')
somefile = somedir.join('otherfile') somedir.mkdir("subsubdir")
somefile.write('foo')
somedir.propset('foo', 'bar') somedir.propset('foo', 'bar')
status = somedir.status() status = somedir.status()
assert len(status.prop_modified) == 1 assert len(status.prop_modified) == 1
assert len(status.modified) == 1 assert len(status.added) == 1
somedir.commit('non-recursive commit', rec=0) somedir.commit('non-recursive commit', rec=0)
status = somedir.status() status = somedir.status()
assert len(status.prop_modified) == 0 assert len(status.prop_modified) == 0
assert len(status.modified) == 1 assert len(status.added) == 1
somedir.commit('recursive commit') somedir.commit('recursive commit')
status = somedir.status() status = somedir.status()
assert len(status.prop_modified) == 0 assert len(status.prop_modified) == 0
assert len(status.modified) == 0 assert len(status.added) == 0
def test_commit_return_value(self): def test_commit_return_value(self):
root = self.root root = self.root

2
py/path/svn/wccommand.py
View File

@ -389,6 +389,8 @@ recursively. """
except py.process.cmdexec.Error, e: except py.process.cmdexec.Error, e:
if e.err.find('Path is not a working copy directory') != -1: if e.err.find('Path is not a working copy directory') != -1:
raise py.error.ENOENT(self, e.err) raise py.error.ENOENT(self, e.err)
elif e.err.find("is not under version control") != -1:
raise py.error.ENOENT(self, e.err)
raise raise
# XXX SVN 1.3 has output on stderr instead of stdout (while it does # XXX SVN 1.3 has output on stderr instead of stdout (while it does
# return 0!), so a bit nasty, but we assume no output is output # return 0!), so a bit nasty, but we assume no output is output