Philip Martin wrote on Fri, Jun 24, 2011 at 13:03:27 +0100:
> Daniel Shahaf <d.s_at_daniel.shahaf.name> writes:
>
> > SERVER_MINOR_VERSION is for testing a 1.7 client with a 1.6 server.
> >
> > I'm after testing a 1.7 client with a 1.7 server using a 1.6 filesystme.
>
> As discussed on IRC, SERVER_MINOR_VERSION should already cause a 1.6
> filesystem to be used. However there is a bug somewhere in the option
> handling that causes options.server_minor_version to be of type string
> so the comparisons against integer values don't work.
>
> The problem occurs if I run:
>
> make check SERVER_MINOR_VERSION=6
>
> but if I run
>
> ./basic_checks.py --server-minor-version 6
>
> the problem is not present. I can fix the problem using the patch below,
> but I don't understand why it is necessary, and I don't know if other
> parameters are affected.
>
In r1139268 I patched build/run_tests.py to store the integer-typed
parameters --- FSFS_SHARDING and SERVER_MINOR_VERSION --- as integers
in svntest.main.options. This fixes create_repos() issue for me.
Thanks for spotting the str/int discrepancy!
> Index: subversion/tests/cmdline/svntest/main.py
> ===================================================================
> --- subversion/tests/cmdline/svntest/main.py (revision 1139223)
> +++ subversion/tests/cmdline/svntest/main.py (working copy)
> @@ -1614,6 +1614,8 @@
> else:
> parser = _create_parser()
>
> + options.server_minor_version = int(options.server_minor_version)
> +
> # parse the positional arguments (test nums, names)
> for arg in test_selection:
> appended = False
>
> --
> Philip
Received on 2011-06-24 14:30:11 CEST