Re: [PATCH 1/1] sanity: disable mirrors for connectivity check

[Joshua Lock <josh@linux.intel.com>]

Any comments?

On Wed, 2011-09-14 at 15:09 -0700, Joshua Lock wrote:
> It's difficult to test a range of fetchers when using mirrors, therefore create a throwaway
> copy of the datastore and delete the MIRROR and PREMIRROR variables to ensure they aren't
> used in the connectivity check.
> 
> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
>  meta/classes/sanity.bbclass |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 93008cc..6ed43b2 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -94,14 +94,18 @@ def check_connectivity(d):
>      # CONNECTIVITY_CHECK_URIS are set
>      network_enabled = not bb.data.getVar('BB_NO_NETWORK', d, True)
>      check_enabled = len(test_uris)
> +    # Take a copy of the data store and unset MIRRORS and PREMIRROS
> +    data = bb.data.createCopy(d)
> +    data.delVar('PREMIRRORS')
> +    data.delVar('MIRRORS')
>      if check_enabled and network_enabled:
>          try:
> -            fetcher = bb.fetch2.Fetch(test_uris, d)
> +            fetcher = bb.fetch2.Fetch(test_uris, data)
>              fetcher.checkstatus()
>          except Exception:
>              # Allow the message to be configured so that users can be
>              # pointed to a support mechanism.
> -            msg = bb.data.getVar('CONNECTIVITY_CHECK_MSG', d, True) or ""
> +            msg = bb.data.getVar('CONNECTIVITY_CHECK_MSG', data, True) or ""
>              if len(msg) == 0:
>                  msg = "Failed to fetch test data from the network. Please ensure your network is configured correctly.\n"
>              retval = msg

-- 
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre