[PATCH] Fix the last of the defaults and include a test to check them

[Andrew Bartlett]

On Fri, 2014-01-31 at 11:51 +0100, Michael Adam wrote:
> On 2014-01-31 at 23:41 +1300, Andrew Bartlett wrote:
> > On Fri, 2014-01-31 at 10:58 +0100, Michael Adam wrote:
> > > 
> > > I have reviewed them and all doc and loadparm changes look
> > > reasonable and good so far.
> > 
> > Great!
> > 
> > > But the new docs.py script fails the "samba.tests.docs"
> > > test: It seems it does not get any of the parameters
> > > from the docs with the ElementTree...
> > > 
> > > "AssertionError: Parameters that are in the implementation but undocumented:"
> > >  lists _all_ parameters.
> > 
> > That's very, very odd.  

Actually, without the XML entities in docs patch, this is expected.  The
reason is that the docs.py test does not (any more, it did during
development) activate python's support for following an XInclude, so the
file seems empty.  We first did XInclude references, but had to fall
back to concatenation of the XML document to be able to use the entities
in a practical way.

> > > The error I am seeing is also different on two different systems:
> > > On our autobuild box (ubuntu 10.04) I see a plain error.
> > > 
> > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > UNEXPECTED(failure): samba.tests.docs.SmbDotConfTests.test_undocumented
> > > REASON: _StringException: Content-Type: text/x-traceback;charset=utf8,language=python
> > > traceback
> > > 238B
> > > Traceback (most recent call last):
> > >   File "/memdisk/obnox/x/b829955/samba/bin/python/samba/tests/docs.py", line 169, in test_undocumented
> > >     "Parameters that are in the implementation but undocumented:"))
> > > AssertionError: Parameters that are in the implementation but undocumented:
> > > 
> > >     -valid
> > >     NIS homedir
> > >     abort shutdown script
> > >     ...
> > >     write ok
> > >     write raw
> > >     writeable
> > >     wtmp directory
> > > 0
> > > 
> > > FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites)
> > > 
> > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > 
> > > 
> > > On my laptop (ubuntu 13.10, I see  garbage output after the above
> > > message (uninitialized memory?...) and apparently the error is not
> > > correctly caught. The test continues with the unknown test and fails
> > > again:
> > 
> > I can at least put your mind and sanity to rest regarding the weird
> > output.  This is an artefact of the subunit2 protocol, and it varies
> > depending on the version of the subunit packages installed on your
> > system.
>  
> > The filters we use should hide these details, but something doesn't
> > quite work right.  At least you can be assured it's nothing unexpected.
> 
> Ok, ... not 100% comforting though. ;-)

I know. 

> > > I guess I will look a little bit, but probably push the patches
> > > without the docs.py update.
> > 
> > Thanks!
> 
> These are in autobuild now.
> 
> > Did you have the 'use XML entities' patches in your series?  (They are
> > needed to get the paths correct).  
> 
> No. Where do I get them? Your param-after-reviewed branch?
> If you point me to the patchset needed in addition to the
> docs.py-uses ElementTree patch, I will give it another shot.

Garming posted a corrected patch set to the list yesterday as:

Re: [PATCH] Change smb.conf.5 build to use XML entities to get
always-correct default paths

These addressed Jelmer's suggestion that dynconfig wasn't a great XML
namespace, and is otherwise ready for master.

The attached series I've tested.  Also still pending is my (large)
param-docs-metadata branch.  Let me know if you want that in patch form,
it never seemed to get to the mailing list due to it's size. 

Andrew Bartlett

-- 
Andrew Bartlett                       http://samba.org/~abartlet/
Authentication Developer, Samba Team  http://samba.org
Samba Developer, Catalyst IT          http://catalyst.net.nz/services/samba

-------------- next part --------------
A non-text attachment was scrubbed...
Name: patches-for-docs-test.patch
Type: text/x-patch
Size: 32419 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140201/5d97f8f2/attachment.bin>