On 4/4/06, Lieven Govaerts <lgo@mobsol.be> wrote:
> Quoting Ivan Zhakov <chemodax@gmail.com>:
>
> > On 4/4/06, zhakov@tigris.org <zhakov@tigris.org> wrote:
> > > Author: zhakov
> > > Date: Tue Apr 4 03:59:17 2006
> > > New Revision: 19164
> > >
> > > Modified:
> > > trunk/win-tests.py
> > >
> > > Log:
> > > Stop service daemon (svnserve or httpd) explicitly in Windows
> > > test runner.
> > >
> > > * win-tests.py: Use one variable daemon for service daemon controler
> > > object, instead of type specific. Delete it explicitly before
> > > cleaning up test directory.
> > >
> > >
> > > Modified: trunk/win-tests.py
> > > URL:
> >
> http://svn.collab.net/viewvc/svn/trunk/win-tests.py?pathrev=19164&r1=19163&r2=19164
> > >
> > ==============================================================================
> > > --- trunk/win-tests.py (original)
> > > +++ trunk/win-tests.py Tue Apr 4 03:59:17 2006
> > > @@ -381,12 +381,14 @@
> > >
> > > # Run the tests
> > > if run_svnserve:
> > > - svnserve = Svnserve(svnserve_args, objdir, abs_objdir, abs_builddir)
> > > - svnserve.start()
> > > + daemon = Svnserve(svnserve_args, objdir, abs_objdir, abs_builddir)
> > >
> > > if run_httpd:
> > > - httpd = Httpd(abs_httpd_dir, abs_builddir, httpd_port)
> > > - httpd.start()
> > > + daemon = Httpd(abs_httpd_dir, abs_builddir, httpd_port)
> > > +
> > > +# Start service daemon, if any
> > > +if daemon:
> > > + daemon.start()
> > >
> > > print 'Testing', objdir, 'configuration on', repo_loc
> > > sys.path.insert(0, os.path.join(abs_srcdir, 'build'))
> > > @@ -404,6 +406,9 @@
> > > else:
> > > os.chdir(old_cwd)
> > >
> > > +# Stop service daemon, if any
> > > +if daemon:
> > > + daemon = None
> > I don't know is it correct way for deleting object. Please let me
> > know, if I did it wrong way.
> >
> > >
> > > # Remove the execs again
> > > for tgt in copied_execs:
> > >
> >
> >
> > --
> > Ivan Zhakov
> >
> Ivan,
>
>
> I get a problem when triggering my Windows buildbot on your change, the tests
> fail with this error: 'NameError: name 'daemon' is not defined'.
>
> This obviously can be a problem specific to my buildbot, but you might check it
> out.
>
> More info here: http://www.mobsol.be/buildbot/ , build nr. 37.
>
> regards,
>
I've fixed this in r19165. Sorry.
--
Ivan Zhakov
Received on Tue Apr 4 14:43:00 2006