Summary

Fixed subvertpy "Assertion `svn_uri_is_canonical(child_uri, ((void *)0))' failed"

Review Request #6215 — Created Aug. 11, 2014 and submitted Aug. 12, 2014, 2:39 p.m.

Information

Owner

1tush

Repository

Review Board

Branch

release-2.0.x

Bugs

Depends On

Commit

e5af89b...

Reviewers

Groups

reviewboard

People

Description

There is an error in list function of subvertpy Client when path parameter ends with trailing slash.

This error also displays when running tests.

output:

python: /build/buildd/subversion-1.8.8/subversion/libsvn_subr/dirent_uri.c:1499: uri_skip_ancestor: Assertion `svn_uri_is_canonical(child_uri, ((void *)0))' failed.

Subvertpy version is 0.9.1

Presented changes cut trailing slash and fixes error.

Testing Done

All tests:
1483 tests run in 121.9 seconds.
45 skipped (1438 tests passed)

./reviewboard/manage.py test -- reviewboard.scmtools.tests:SubvertpyTests
Testing SVN (subvertpy) parsing SVN diff with binary file ... passed
Testing SVN keyword collapsing ... passed
Testing parsing SVN diff with added empty file ... passed
Testing parsing SVN diff with deleted empty file ... passed
Testing SVN (subvertpy) parsing diff with spaces in filenames ... passed
Testing SVN (subvertpy) get_branches ... passed
Testing SVN (subvertpy) get_change ... passed
Testing SVN (subvertpy) get_commits ... passed
Testing SVN (subvertpy) get_commits with branch ... passed
Testing SVN (subvertpy) get_file ... passed
Testing SVN (subvertpy) with basic SVNTool API ... passed
Testing SVN (subvertpy) parsing diff with keywords ... passed
Testing correct concat svn repopath and path ... passed
Testing SVN (subvertpy) revision number parsing ... passed
Testing SVN (subvertpy) with a SSH-backed Subversion repository ... skipped
Testing SVN (subvertpy) with a SSH-backed Subversion repository with a LocalSite ... skipped
Testing SVN (subvertpy) parsing SVN 1.6 diff with property changes ... passed
Testing SVN (subvertpy) parsing SVN 1.7+ diff with property changes ... passed
Testing SVN (subvertpy) parsing diff with unicode characters ... passed
Testing SVN (subvertpy) parsing diff with unterminated keywords ... passed
Testing SVN (subvertpy) with UTF-8 files with keywords ... passed

Issues

Description	From	Last Updated
Can you include the blank line between the above conditional and this code, and add a comment explaining the rstrip?	david	Aug. 11, 2014, 2:04 p.m.
Typo.	david	Aug. 12, 2014, 2:50 a.m.

Tool: PEP8 Style Checker
Processed Files:
    reviewboard/scmtools/svn/subvertpy.py



Tool: Pyflakes
Processed Files:
    reviewboard/scmtools/svn/subvertpy.py

reviewboard/scmtools/svn/subvertpy.py (Diff revision 1)

The issue has been resolved. Show all issues

Can you include the blank line between the above conditional and this code, and add a comment explaining the rstrip?

1T

1tush Aug. 11, 2014, 2:04 p.m.
```
Updated diff
```

Commit:

e5af89b48423b638710eea6e334568ffdb1a9ec2

Diff:

Revision 2 (+4 -1)

Show changes

reviewboard/scmtools/svn/subvertpy.py

Can you fill out the "Testing done" section?

reviewboard/scmtools/svn/subvertpy.py (Diff revision 2)
The issue has been resolved. Show all issues
```
Typo.
```

Testing Done:: +
All tests:
+ 1483 tests run in 121.9 seconds.
+ 45 skipped (1438 tests passed)
+
+
./reviewboard/manage.py test -- reviewboard.scmtools.tests:SubvertpyTests
+ Testing SVN (subvertpy) parsing SVN diff with binary file ... passed
+ Testing SVN keyword collapsing ... passed
+ Testing parsing SVN diff with added empty file ... passed
+ Testing parsing SVN diff with deleted empty file ... passed
+ Testing SVN (subvertpy) parsing diff with spaces in filenames ... passed
+ Testing SVN (subvertpy) get_branches ... passed
+ Testing SVN (subvertpy) get_change ... passed
+ Testing SVN (subvertpy) get_commits ... passed
+ Testing SVN (subvertpy) get_commits with branch ... passed
+ Testing SVN (subvertpy) get_file ... passed
+ Testing SVN (subvertpy) with basic SVNTool API ... passed
+ Testing SVN (subvertpy) parsing diff with keywords ... passed
+ Testing correct concat svn repopath and path ... passed
+ Testing SVN (subvertpy) revision number parsing ... passed
+ Testing SVN (subvertpy) with a SSH-backed Subversion repository ... skipped
+ Testing SVN (subvertpy) with a SSH-backed Subversion repository with a LocalSite ... skipped
+ Testing SVN (subvertpy) parsing SVN 1.6 diff with property changes ... passed
+ Testing SVN (subvertpy) parsing SVN 1.7+ diff with property changes ... passed
+ Testing SVN (subvertpy) parsing diff with unicode characters ... passed
+ Testing SVN (subvertpy) parsing diff with unterminated keywords ... passed
+ Testing SVN (subvertpy) with UTF-8 files with keywords ... passed

Ship it!

```
Ship It!
```

Status:: Completed
Change Summary:: Pushed to release-2.0.x (731f4bc)

	+	All tests:
	+	1483 tests run in 121.9 seconds.
	+	45 skipped (1438 tests passed)
	+
	+	./reviewboard/manage.py test -- reviewboard.scmtools.tests:SubvertpyTests
	+	Testing SVN (subvertpy) parsing SVN diff with binary file ... passed
	+	Testing SVN keyword collapsing ... passed
	+	Testing parsing SVN diff with added empty file ... passed
	+	Testing parsing SVN diff with deleted empty file ... passed
	+	Testing SVN (subvertpy) parsing diff with spaces in filenames ... passed
	+	Testing SVN (subvertpy) get_branches ... passed
	+	Testing SVN (subvertpy) get_change ... passed
	+	Testing SVN (subvertpy) get_commits ... passed
	+	Testing SVN (subvertpy) get_commits with branch ... passed
	+	Testing SVN (subvertpy) get_file ... passed
	+	Testing SVN (subvertpy) with basic SVNTool API ... passed
	+	Testing SVN (subvertpy) parsing diff with keywords ... passed
	+	Testing correct concat svn repopath and path ... passed
	+	Testing SVN (subvertpy) revision number parsing ... passed
	+	Testing SVN (subvertpy) with a SSH-backed Subversion repository ... skipped
	+	Testing SVN (subvertpy) with a SSH-backed Subversion repository with a LocalSite ... skipped
	+	Testing SVN (subvertpy) parsing SVN 1.6 diff with property changes ... passed
	+	Testing SVN (subvertpy) parsing SVN 1.7+ diff with property changes ... passed
	+	Testing SVN (subvertpy) parsing diff with unicode characters ... passed
	+	Testing SVN (subvertpy) parsing diff with unterminated keywords ... passed
	+	Testing SVN (subvertpy) with UTF-8 files with keywords ... passed