Patchwork [1/1] sanity: disable mirrors for connectivity check

login
register
mail settings
Submitter Joshua Lock
Date Sept. 14, 2011, 10:09 p.m.
Message ID <9320024626bed55a7c6058131e1cb6c47944a36d.1316037832.git.josh@linux.intel.com>
Download mbox | patch
Permalink /patch/11413/
State New, archived
Headers show

Comments

Joshua Lock - Sept. 14, 2011, 10:09 p.m.
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(-)
Richard Purdie - Sept. 16, 2011, 5:07 p.m.
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(-)

Merged to master, thanks.

Richard
Joshua Lock - Sept. 16, 2011, 5:12 p.m.
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

Patch

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