Re: [PATCH] Follow-up from r25450 (was Re: svn trunk r25450:FAIL(x86-macosx-gnu shared))

On Tue, 2007-06-19 at 11:39 +0530, Kamesh Jayachandran wrote:
> Bhuvan,
>
> I did not test this. But it looks good.
>
> +1 to commit.

Thanks Kamesh. Committed this patch in r25454.

> Bhuvaneswaran Arumugam wrote:
> > On Tue, 2007-06-19 at 07:41 +0200, Lieven Govaerts wrote:
> >
> >> A lot of failures on buildbot tonight. This is the log of the failed test:
> >>
> >> ..
> >>
> >>> Running all tests in svnversion_tests.py [42/50]...success
> >>> Running all tests in utf8_tests.py [43/50]...success
> >>> Running all tests in history_tests.py [44/50]...success
> >>> Running all tests in lock_tests.py [45/50]...FAILURE
> >>> Running all tests in cat_tests.py [46/50]...success
> >>> Running all tests in import_tests.py [47/50]...success
> >>> Running all tests in svnsync_tests.py [48/50]...success
> >>> Running all tests in authz_tests.py [49/50]...success
> >>> Running all tests in depth_tests.py [50/50]...success
> >>>
> >> ..
> >>
> >> START: lock_tests.py
> >> Traceback (most recent call last):
> >> File
> >> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/lock_tests.py",
> >> line 26, in ?
> >> from prop_tests import check_prop
> >> ImportError: cannot import name check_prop
> >> END: lock_tests.py
> >>
> >> If anyone has time to look at it, be my guest.
> >>
> >
> > Please find attached a patch for this issue.
> >
> > Fix the regression caused by r25450 which breaks lock test cases.
> > [[
> > This is a follow-up fix for r25450. As per r25450, check_prop() function
> > was moved to svntest.actions library. Modify the lock test cases to
> > refer to this function.
> >
> > * subversion/tests/cmdline/lock_tests.py
> > Do not import check_prop() function from prop_tests library.
> > (enforce_lock): Refer to check_prop() function in svntest.actions
> > library.
> > ]]
> >
> > ------------------------------------------------------------------------
> >
> > Index: subversion/tests/cmdline/lock_tests.py
> > ===================================================================
> > --- subversion/tests/cmdline/lock_tests.py (revision 25453)
> > +++ subversion/tests/cmdline/lock_tests.py (working copy)
> > @@ -22,9 +22,6 @@
> > # Our testing module
> > import svntest
> >
> > -# A helper function for examining svn:needs-lock
> > -from prop_tests import check_prop
> > -
> > # (abbreviation)
> > Skip = svntest.testcase.Skip
> > SkipUnless = svntest.testcase.SkipUnless
> > @@ -375,9 +372,9 @@
> > svntest.main.run_svn(None, 'propset', 'svn:needs-lock', ' ', mu_path)
> >
> > # Check svn:needs-lock
> > - check_prop('svn:needs-lock', iota_path, ['*'])
> > - check_prop('svn:needs-lock', lambda_path, ['*'])
> > - check_prop('svn:needs-lock', mu_path, ['*'])
> > + svntest.actions.check_prop('svn:needs-lock', iota_path, ['*'])
> > + svntest.actions.check_prop('svn:needs-lock', lambda_path, ['*'])
> > + svntest.actions.check_prop('svn:needs-lock', mu_path, ['*'])
> >
> > svntest.main.run_svn(None, 'commit',
> > '--username', svntest.main.wc_author,
> >
>

--