Add extensible SDK update test

From: Aníbal Limón <[email protected]>

The removal of bitbake and scripts PATH is only needed by eSDK tests so move to eSDK context only.

This also it's a support for eSDK update test because it needs to execute oe-publish-sdk from scripts.

Signed-off-by Aníbal Limón <[email protected]>

---
  meta/classes/testsdk.bbclass |  9 ++++-----
  meta/lib/oeqa/oetest.py      | 22 +++++++++++++++++++++-
  2 files changed, 25 insertions(+), 6 deletions(-)

meta/classes/testsdk.bbclass +4 -5

index 7e245e9..01d37c4 100644
@@ -96,11 +96,10 @@ def testsdkext_main(d):
      # extensible sdk use network
      export_proxies(d)
 
-    # extensible sdk shows a warning if found bitbake in the path
-    # because can cause problems so clean it
-    paths_to_avoid = ['bitbake/bin', 'poky/scripts',
-                       d.getVar('STAGING_DIR', True),
-                       d.getVar('BASE_WORKDIR', True)]
+    # extensible sdk can be contaminated if native programs are
+    # in PATH, i.e. use perl-native instead of eSDK one.
+    paths_to_avoid = [d.getVar('STAGING_DIR', True),
+                      d.getVar('BASE_WORKDIR', True)]
      avoid_paths_in_environ(paths_to_avoid)
 
      pn = d.getVar("PN", True)

meta/lib/oeqa/oetest.py +5 -1

index 3e2ea0f..cd1e7e0 100644
@@ -21,6 +21,7 @@ import logging
  import oeqa.runtime
  import oeqa.sdkext
  from oeqa.utils.decorators import LogResults, gettag, getResults
+from oeqa.utils import avoid_paths_in_environ
 
  logger = logging.getLogger("BitBake")
 

@@ -128,7 +129,26 @@ class oeSDKTest(oeTest):
          return subprocess.check_output(". %s > /dev/null; %s;" % (self.tc.sdkenv, cmd), shell=True)
 
  class oeSDKExtTest(oeSDKTest):
-    pass
+    def _run(self, cmd):
+        output = None
+
+        paths = os.environ['PATH']

meta/lib/oeqa/oetest.py +6 -0

+        except:
+            os.environ['PATH'] = paths
+            raise
+
+        os.environ['PATH'] = paths
+        return output
 
  def getmodule(pos=2):
      # stack returns a list of tuples containg frame information

Quoted 61 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

The removal of bitbake and scripts PATH is only needed by eSDK tests so move to eSDK context only.

This also it's a support for eSDK update test because it needs to execute oe-publish-sdk from scripts.

Signed-off-by Aníbal Limón <[email protected]>

---
  meta/classes/testsdk.bbclass |  9 ++++-----
  meta/lib/oeqa/oetest.py      | 22 +++++++++++++++++++++-
  2 files changed, 25 insertions(+), 6 deletions(-)

meta/classes/testsdk.bbclass +4 -5

index 7e245e9..01d37c4 100644
@@ -96,11 +96,10 @@ def testsdkext_main(d):
      # extensible sdk use network
      export_proxies(d)
 
-    # extensible sdk shows a warning if found bitbake in the path
-    # because can cause problems so clean it
-    paths_to_avoid = ['bitbake/bin', 'poky/scripts',
-                       d.getVar('STAGING_DIR', True),
-                       d.getVar('BASE_WORKDIR', True)]
+    # extensible sdk can be contaminated if native programs are
+    # in PATH, i.e. use perl-native instead of eSDK one.
+    paths_to_avoid = [d.getVar('STAGING_DIR', True),
+                      d.getVar('BASE_WORKDIR', True)]
      avoid_paths_in_environ(paths_to_avoid)
 
      pn = d.getVar("PN", True)

meta/lib/oeqa/oetest.py +10 -1

index 3e2ea0f..cd1e7e0 100644
@@ -21,6 +21,7 @@ import logging
  import oeqa.runtime
  import oeqa.sdkext
  from oeqa.utils.decorators import LogResults, gettag, getResults
+from oeqa.utils import avoid_paths_in_environ
 
  logger = logging.getLogger("BitBake")
 

@@ -128,7 +129,26 @@ class oeSDKTest(oeTest):
          return subprocess.check_output(". %s > /dev/null; %s;" %
 (self.tc.sdkenv, cmd), shell=True)
 
  class oeSDKExtTest(oeSDKTest):
-    pass
+    def _run(self, cmd):
+        output = None
+
+        paths = os.environ['PATH']
+
+        # extensible sdk shows a warning if found bitbake in the path
+        # because can cause contamination, i.e. use devtool from
+        # poky/scripts instead of eSDK one.
+        paths_to_avoid = ['bitbake/bin', 'poky/scripts']

meta/lib/oeqa/oetest.py class oeSDKTest(oeTest): · line 145

Quoted 5 lines

meta/lib/oeqa/oetest.py +5 -0

+        avoid_paths_in_environ(paths_to_avoid)
+
+        try:
+            output = subprocess.check_output(". %s > /dev/null; %s;" % \
+                (self.tc.sdkenv, cmd), shell=True)

Just pass env to the check_output call, then you won't have to worry about resetting the parent process' env back to the original value.

Quoted 11 lines

meta/lib/oeqa/oetest.py +6 -0

+        except:
+            os.environ['PATH'] = paths
+            raise
+
+        os.environ['PATH'] = paths
+        return output
 
  def getmodule(pos=2):

      # stack returns a list of tuples containg frame information

Quoted 62 lines · Randy Witt

Quoted 61 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

The removal of bitbake and scripts PATH is only needed by eSDK tests so move to eSDK context only.

This also it's a support for eSDK update test because it needs to execute oe-publish-sdk from scripts.

Signed-off-by Aníbal Limón <[email protected]>

---
   meta/classes/testsdk.bbclass |  9 ++++-----
   meta/lib/oeqa/oetest.py      | 22 +++++++++++++++++++++-
   2 files changed, 25 insertions(+), 6 deletions(-)

meta/classes/testsdk.bbclass +4 -5

index 7e245e9..01d37c4 100644
@@ -96,11 +96,10 @@ def testsdkext_main(d):
       # extensible sdk use network
       export_proxies(d)
 
-    # extensible sdk shows a warning if found bitbake in the path
-    # because can cause problems so clean it
-    paths_to_avoid = ['bitbake/bin', 'poky/scripts',
-                       d.getVar('STAGING_DIR', True),
-                       d.getVar('BASE_WORKDIR', True)]
+    # extensible sdk can be contaminated if native programs are
+    # in PATH, i.e. use perl-native instead of eSDK one.
+    paths_to_avoid = [d.getVar('STAGING_DIR', True),
+                      d.getVar('BASE_WORKDIR', True)]
       avoid_paths_in_environ(paths_to_avoid)
 
       pn = d.getVar("PN", True)

meta/lib/oeqa/oetest.py +10 -1

index 3e2ea0f..cd1e7e0 100644
@@ -21,6 +21,7 @@ import logging
   import oeqa.runtime
   import oeqa.sdkext
   from oeqa.utils.decorators import LogResults, gettag, getResults
+from oeqa.utils import avoid_paths_in_environ
 
   logger = logging.getLogger("BitBake")
 

@@ -128,7 +129,26 @@ class oeSDKTest(oeTest):
           return subprocess.check_output(". %s > /dev/null; %s;" %
 (self.tc.sdkenv, cmd), shell=True)
 
   class oeSDKExtTest(oeSDKTest):
-    pass
+    def _run(self, cmd):
+        output = None
+
+        paths = os.environ['PATH']
+
+        # extensible sdk shows a warning if found bitbake in the path
+        # because can cause contamination, i.e. use devtool from
+        # poky/scripts instead of eSDK one.
+        paths_to_avoid = ['bitbake/bin', 'poky/scripts']

Quoted 8 lines

meta/lib/oeqa/oetest.py class oeSDKTest(oeTest): · line 145

Quoted 5 lines

meta/lib/oeqa/oetest.py +5 -0

+        avoid_paths_in_environ(paths_to_avoid)
+
+        try:
+            output = subprocess.check_output(". %s > /dev/null; %s;" % \
+                (self.tc.sdkenv, cmd), shell=True)

Just pass env to the check_output call, then you won't have to worry about resetting the parent process' env back to the original value.

Could be but then we need the code for generate the env line so for practically the result is the same.

Quoted 13 lines

Quoted 12 lines

meta/lib/oeqa/oetest.py +6 -0

+        except:
+            os.environ['PATH'] = paths
+            raise
+
+        os.environ['PATH'] = paths
+        return output
 
   def getmodule(pos=2):

       # stack returns a list of tuples containg frame information

Quoted 76 lines · Aníbal Limón

Quoted 72 lines · Randy Witt

Quoted 58 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

The removal of bitbake and scripts PATH is only needed by eSDK tests so move to eSDK context only.

This also it's a support for eSDK update test because it needs to execute oe-publish-sdk from scripts.

Signed-off-by Aníbal Limón <[email protected]>

---
   meta/classes/testsdk.bbclass |  9 ++++-----
   meta/lib/oeqa/oetest.py      | 22 +++++++++++++++++++++-
   2 files changed, 25 insertions(+), 6 deletions(-)

meta/classes/testsdk.bbclass +4 -5

index 7e245e9..01d37c4 100644
@@ -96,11 +96,10 @@ def testsdkext_main(d):
       # extensible sdk use network
       export_proxies(d)
 
-    # extensible sdk shows a warning if found bitbake in the path
-    # because can cause problems so clean it
-    paths_to_avoid = ['bitbake/bin', 'poky/scripts',
-                       d.getVar('STAGING_DIR', True),
-                       d.getVar('BASE_WORKDIR', True)]
+    # extensible sdk can be contaminated if native programs are
+    # in PATH, i.e. use perl-native instead of eSDK one.
+    paths_to_avoid = [d.getVar('STAGING_DIR', True),
+                      d.getVar('BASE_WORKDIR', True)]
       avoid_paths_in_environ(paths_to_avoid)
 
       pn = d.getVar("PN", True)

meta/lib/oeqa/oetest.py +6 -1

index 3e2ea0f..cd1e7e0 100644
@@ -21,6 +21,7 @@ import logging
   import oeqa.runtime
   import oeqa.sdkext
   from oeqa.utils.decorators import LogResults, gettag, getResults
+from oeqa.utils import avoid_paths_in_environ
 
   logger = logging.getLogger("BitBake")
 

@@ -128,7 +129,26 @@ class oeSDKTest(oeTest):
           return subprocess.check_output(". %s > /dev/null; %s;" %
 (self.tc.sdkenv, cmd), shell=True)
 
   class oeSDKExtTest(oeSDKTest):
-    pass
+    def _run(self, cmd):
+        output = None
+
+        paths = os.environ['PATH']
+

meta/lib/oeqa/oetest.py class oeSDKTest(oeTest): · line 147

Quoted 10 lines

meta/lib/oeqa/oetest.py +9 -0

+        # extensible sdk shows a warning if found bitbake in the path
+        # because can cause contamination, i.e. use devtool from
+        # poky/scripts instead of eSDK one.
+        paths_to_avoid = ['bitbake/bin', 'poky/scripts']
+        avoid_paths_in_environ(paths_to_avoid)
+
+        try:
+            output = subprocess.check_output(". %s > /dev/null;
 %s;" % \
+                (self.tc.sdkenv, cmd), shell=True)

Just pass env to the check_output call, then you won't have to worry about resetting the parent process' env back to the original value.

Quoted 2 lines

Could be but then we need the code for generate the env line so for practically the result is the same.

Modify avoid_paths_in_environ() to instead return the environment rather than modify it as a side effect. Then the code reads more easily and prevents future bugs where someone uses avoid_paths_in_environ, but forgets to reset the os.environ.

Quoted 15 lines

Quoted 14 lines

Quoted 13 lines

meta/lib/oeqa/oetest.py +6 -0

+        except:
+            os.environ['PATH'] = paths
+            raise
+
+        os.environ['PATH'] = paths
+        return output
 

def getmodule(pos=2):

       # stack returns a list of tuples containg frame information

I agree with you to modify avoid_paths_in_environ for return the new PATH variable is better than only modify it internally but for simplicity i will maintain the os.environ['PATH'] set/restore instead of generate the environment line.

Quoted 5 lines · Aníbal Limón

I agree with you to modify avoid_paths_in_environ for return the new PATH variable is better than only modify it internally but for simplicity i will maintain the os.environ['PATH'] set/restore instead of generate the environment line.

Totally agree with Randy here for what it's worth. The environment-munging code in avoid_paths... should return the strings instead of manipulating the current environment so the caller has the choice whether to modify the current environment or pass a new environment to subprocess. And in general I'd say that passing modified environments to subprocess is a cleaner solution as it means that there's no way cleanup can fail to happen. Whilst that's just a try/except now, the code could get copied and extended and end up with codepaths that don't hit the right cleanup. By having an explicit environment passed in, this isn't possible.

Ross

Quoted 9 lines · Ross

Quoted 5 lines · Aníbal Limón

I agree with you to modify avoid_paths_in_environ for return the new PATH variable is better than only modify it internally but for simplicity i will maintain the os.environ['PATH'] set/restore instead of generate the environment line.

Quoted 9 lines

Totally agree with Randy here for what it's worth. The environment-munging code in avoid_paths... should return the strings instead of manipulating the current environment so the caller has the choice whether to modify the current environment or pass a new environment to subprocess. And in general I'd say that passing modified environments to subprocess is a cleaner solution as it means that there's no way cleanup can fail to happen. Whilst that's just a try/except now, the code could get copied and extended and end up with codepaths that don't hit the right cleanup. By having an explicit environment passed in, this isn't possible.

Agree, now modified at,

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=alimon/esdk_update_v2&id=3143bf09130c52cd71e3f2f9795208e17152005d

Cheers,
alimon

Quoted 3 lines

Ross

Quoted 27 lines · Aníbal Limón

Quoted 11 lines · Ross

Quoted 6 lines · Aníbal Limón

I agree with you to modify avoid_paths_in_environ for return the new PATH variable is better than only modify it internally but for simplicity i will maintain the os.environ['PATH'] set/restore instead of
generate the environment line.

Quoted 12 lines

Totally agree with Randy here for what it's worth. The environment-munging
code in avoid_paths... should return the strings instead of manipulating the current environment so the caller has the choice whether to modify the
current environment or pass a new environment to subprocess. And in general I'd say that passing modified environments to subprocess is a cleaner solution as it means that there's no way cleanup can fail to happen. Whilst that's just a try/except now, the code could get copied and
extended and end up with codepaths that don't hit the right cleanup. By having an explicit environment passed in, this isn't possible.

Quoted 4 lines

Agree, now modified at,

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=alimon/esdk_update_v2&id=3143bf09130c52cd71e3f2f9795208e17152005d

If you either convert path to a dict or have avoid_paths_in_environ() return a dict you can do:

(quoted diff) +2 -0

+            output = subprocess.check_output(". %s > /dev/null; %s;" % \
+                (self.tc.sdkenv, cmd), env=path, shell=True)

It's not quite obvious in the docs that you can pass that in, they refer you to the Popen docs.

Quoted 8 lines

Cheers,
alimon

Quoted 3 lines

Ross

Quoted 39 lines · Randy Witt

Quoted 27 lines · Aníbal Limón

Quoted 11 lines · Ross

Quoted 6 lines · Aníbal Limón

I agree with you to modify avoid_paths_in_environ for return the new PATH variable is better than only modify it internally but for simplicity i will maintain the os.environ['PATH'] set/restore instead of
generate the environment line.

Quoted 12 lines

Totally agree with Randy here for what it's worth. The environment-munging
code in avoid_paths... should return the strings instead of manipulating the current environment so the caller has the choice whether to modify the
current environment or pass a new environment to subprocess. And in general I'd say that passing modified environments to subprocess is a cleaner solution as it means that there's no way cleanup can fail to happen. Whilst that's just a try/except now, the code could get copied and
extended and end up with codepaths that don't hit the right cleanup. By having an explicit environment passed in, this isn't possible.

Quoted 4 lines

Agree, now modified at,

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=alimon/esdk_update_v2&id=3143bf09130c52cd71e3f2f9795208e17152005d

If you either convert path to a dict or have avoid_paths_in_environ() return a dict you can do:

(quoted diff) +2 -0

+            output = subprocess.check_output(". %s > /dev/null; %s;" % \
+                (self.tc.sdkenv, cmd), env=path, shell=True)

Quoted 2 lines

It's not quite obvious in the docs that you can pass that in, they refer you to the Popen docs.

I know that you could pass env in kwargs but since it's using shell=True is easy to set PATH inline also it causes a little overhead for copy the os.environ.

But if you want the another way that's ok, see [1].

[1]
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=alimon/esdk_update_v2&id=ab84d325c5cbb751d7b18e861964b757d9682e0f

alimon

Quoted 9 lines

Quoted 8 lines

Cheers,
alimon

Quoted 3 lines

Ross

From: Aníbal Limón <[email protected]>

The SDKUpdateTest class test devtool sdk-update mechanism inside eSDK.

The SDKUpdateTest class search for new sdk if not found uses the main one then it publish the eSDK into known folder inside work and it starts a web server for serve the eSDK.

Finally it executes sdk-update over http, the local test is commented due to bug [1].

[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=9043

[YOCTO #9089]

Signed-off-by Aníbal Limón <[email protected]>

---
  meta/lib/oeqa/sdkext/sdk_update.py | 39 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 39 insertions(+)

create mode 100644 meta/lib/oeqa/sdkext/sdk_update.py

meta/lib/oeqa/sdkext/sdk_update.py new file +16 -0

new file mode 100644
index 0000000..16f5b10
@@ -0,0 +1,39 @@
+import os
+import shutil
+import subprocess
+
+from oeqa.oetest import oeSDKExtTest
+from oeqa.utils.httpserver import HTTPService
+
+class SdkUpdateTest(oeSDKExtTest):
+
+    @classmethod
+    def setUpClass(self):
+        self.publish_dir = os.path.join(self.tc.sdktestdir, 'esdk_publish')
+        if os.path.exists(self.publish_dir):
+            shutil.rmtree(self.publish_dir)
+        os.mkdir(self.publish_dir)
+

meta/lib/oeqa/sdkext/sdk_update.py new file +12 -0

+        self.http_url = "http://127.0.0.1:%d" % self.http_service.port
+
+    def test_sdk_update_http(self):
+        output = self._run("devtool sdk-update \"%s\"" % self.http_url)
+
+#    def test_sdk_update_local(self):
+#        output = self._run("devtool sdk-update \"%s\"" % self.publish_dir)
+
+    @classmethod
+    def tearDownClass(self):
+        self.http_service.stop()
+        shutil.rmtree(self.publish_dir)

Quoted 54 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

The SDKUpdateTest class test devtool sdk-update mechanism inside eSDK.

The SDKUpdateTest class search for new sdk if not found uses the main one then it publish the eSDK into known folder inside work and it starts a web server for serve the eSDK.

Finally it executes sdk-update over http, the local test is commented due to bug [1].

[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=9043

[YOCTO #9089]

Signed-off-by Aníbal Limón <[email protected]>

---
  meta/lib/oeqa/sdkext/sdk_update.py | 39
++++++++++++++++++++++++++++++++++++++
  1 file changed, 39 insertions(+)

create mode 100644 meta/lib/oeqa/sdkext/sdk_update.py

meta/lib/oeqa/sdkext/sdk_update.py new file +12 -0

new file mode 100644
index 0000000..16f5b10
@@ -0,0 +1,39 @@
+import os
+import shutil
+import subprocess
+
+from oeqa.oetest import oeSDKExtTest
+from oeqa.utils.httpserver import HTTPService
+
+class SdkUpdateTest(oeSDKExtTest):
+
+    @classmethod
+    def setUpClass(self):
+        self.publish_dir = os.path.join(self.tc.sdktestdir,

'esdk_publish')

meta/lib/oeqa/sdkext/sdk_update.py new file +11 -0

+        if os.path.exists(self.publish_dir):
+            shutil.rmtree(self.publish_dir)
+        os.mkdir(self.publish_dir)
+
+        tcname_new = self.tc.d.expand(
+            "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}-new.sh")
+        if not os.path.exists(tcname_new):
+            tcname_new = self.tc.tcname
+
+        cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir)
+        subprocess.check_output(cmd, shell=True)

meta/lib/oeqa/sdkext/sdk_update.py line 26

Quoted 3 lines

meta/lib/oeqa/sdkext/sdk_update.py new file +3 -0

+
+        self.http_service = HTTPService(self.publish_dir)
+        self.http_service.start()

I think Paul and I briefly mentioned it, but SimpleHTTPServer fails as an sstate mirror if enough fetchers run. We think it was because of a limit on the number of simultaneous connections. So I would expect this to fail for instance if all packages were updated.

But really we shouldn't care too much about the sstate updating part, and more about the layer updating etc. Ideally this test would check to make sure the local sdk now matches the remote.

Quoted 15 lines

meta/lib/oeqa/sdkext/sdk_update.py new file +7 -0

+        self.http_url = "http://127.0.0.1:%d" % self.http_service.port
+
+    def test_sdk_update_http(self):
+        output = self._run("devtool sdk-update \"%s\"" % self.http_url)
+
+#    def test_sdk_update_local(self):
+#        output = self._run("devtool sdk-update \"%s\"" %

self.publish_dir)

meta/lib/oeqa/sdkext/sdk_update.py new file +5 -0

+
+    @classmethod
+    def tearDownClass(self):
+        self.http_service.stop()
+        shutil.rmtree(self.publish_dir)

Quoted 55 lines · Randy Witt

Quoted 54 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

The SDKUpdateTest class test devtool sdk-update mechanism inside eSDK.

The SDKUpdateTest class search for new sdk if not found uses the main one then it publish the eSDK into known folder inside work and it starts a web server for serve the eSDK.

Finally it executes sdk-update over http, the local test is commented due to bug [1].

[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=9043

[YOCTO #9089]

Signed-off-by Aníbal Limón <[email protected]>

---
   meta/lib/oeqa/sdkext/sdk_update.py | 39
++++++++++++++++++++++++++++++++++++++
   1 file changed, 39 insertions(+)

create mode 100644 meta/lib/oeqa/sdkext/sdk_update.py

meta/lib/oeqa/sdkext/sdk_update.py new file +12 -0

new file mode 100644
index 0000000..16f5b10
@@ -0,0 +1,39 @@
+import os
+import shutil
+import subprocess
+
+from oeqa.oetest import oeSDKExtTest
+from oeqa.utils.httpserver import HTTPService
+
+class SdkUpdateTest(oeSDKExtTest):
+
+    @classmethod
+    def setUpClass(self):
+        self.publish_dir = os.path.join(self.tc.sdktestdir,

'esdk_publish')

meta/lib/oeqa/sdkext/sdk_update.py new file +11 -0

+        if os.path.exists(self.publish_dir):
+            shutil.rmtree(self.publish_dir)
+        os.mkdir(self.publish_dir)
+
+        tcname_new = self.tc.d.expand(
+            "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}-new.sh")
+        if not os.path.exists(tcname_new):
+            tcname_new = self.tc.tcname
+
+        cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir)
+        subprocess.check_output(cmd, shell=True)

Quoted 8 lines

meta/lib/oeqa/sdkext/sdk_update.py line 26

Quoted 3 lines

meta/lib/oeqa/sdkext/sdk_update.py new file +3 -0

+
+        self.http_service = HTTPService(self.publish_dir)
+        self.http_service.start()

I think Paul and I briefly mentioned it, but SimpleHTTPServer fails as an sstate mirror if enough fetchers run. We think it was because of a limit on the number of simultaneous connections. So I would expect this to fail for instance if all packages were updated.

I tested running an update and didn't fail this implementation of oeqa.utils open another process with multiprocessing for serve http only.

Quoted 4 lines

But really we shouldn't care too much about the sstate updating part, and more about the layer updating etc. Ideally this test would check to make sure the local sdk now matches the remote.

I could add a test for the output that i saw displays "Already updated" or what you mean about match?

Quoted 17 lines

Quoted 16 lines

meta/lib/oeqa/sdkext/sdk_update.py new file +7 -0

+        self.http_url = "http://127.0.0.1:%d" % self.http_service.port
+
+    def test_sdk_update_http(self):
+        output = self._run("devtool sdk-update \"%s\"" % self.http_url)
+
+#    def test_sdk_update_local(self):
+#        output = self._run("devtool sdk-update \"%s\"" %

self.publish_dir)

meta/lib/oeqa/sdkext/sdk_update.py new file +5 -0

+
+    @classmethod
+    def tearDownClass(self):
+        self.http_service.stop()
+        shutil.rmtree(self.publish_dir)

Quoted 67 lines · Aníbal Limón

Quoted 63 lines · Randy Witt

Quoted 47 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

The SDKUpdateTest class test devtool sdk-update mechanism inside eSDK.

The SDKUpdateTest class search for new sdk if not found uses the main one then it publish the eSDK into known folder inside work and it starts a web server for serve the eSDK.

Finally it executes sdk-update over http, the local test is commented due to bug [1].

[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=9043

[YOCTO #9089]

Signed-off-by Aníbal Limón <[email protected]>

---
   meta/lib/oeqa/sdkext/sdk_update.py | 39
++++++++++++++++++++++++++++++++++++++
   1 file changed, 39 insertions(+)

create mode 100644 meta/lib/oeqa/sdkext/sdk_update.py

meta/lib/oeqa/sdkext/sdk_update.py new file +12 -0

new file mode 100644
index 0000000..16f5b10
@@ -0,0 +1,39 @@
+import os
+import shutil
+import subprocess
+
+from oeqa.oetest import oeSDKExtTest
+from oeqa.utils.httpserver import HTTPService
+
+class SdkUpdateTest(oeSDKExtTest):
+
+    @classmethod
+    def setUpClass(self):
+        self.publish_dir = os.path.join(self.tc.sdktestdir,

'esdk_publish')

meta/lib/oeqa/sdkext/sdk_update.py new file +4 -0

+        if os.path.exists(self.publish_dir):
+            shutil.rmtree(self.publish_dir)
+        os.mkdir(self.publish_dir)
+

meta/lib/oeqa/sdkext/sdk_update.py line 26

Quoted 10 lines

meta/lib/oeqa/sdkext/sdk_update.py new file +10 -0

+        tcname_new = self.tc.d.expand(
+            "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}-new.sh")
+        if not os.path.exists(tcname_new):
+            tcname_new = self.tc.tcname
+
+        cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir)
+        subprocess.check_output(cmd, shell=True)
+
+        self.http_service = HTTPService(self.publish_dir)
+        self.http_service.start()

I think Paul and I briefly mentioned it, but SimpleHTTPServer fails as an sstate mirror if enough fetchers run. We think it was because of a limit on the number of simultaneous connections. So I would expect this to fail for instance if all packages were updated.

Quoted 2 lines

I tested running an update and didn't fail this implementation of oeqa.utils open another process with multiprocessing for serve http only.

My suspicion is because nothing actually updated. And even if something updated, unless you hit the max connection limit when pulling from sstate_mirror it would be fine.

Quoted 8 lines

Quoted 5 lines

But really we shouldn't care too much about the sstate updating part, and more about the layer updating etc. Ideally this test would check to make sure the local sdk now matches the remote.

I could add a test for the output that i saw displays "Already updated" or what you mean about match?

devtool sdk-update will check the remote conf/sdk-conf-manifest to see if any configuration changed. So for instance the creator of the sdk could add new configuration variables, or even items to bblayers.conf.

If the sdk-conf-manifest is changed, the updater should pull down the new layer by pulling(cloning if that fails) layers/.git on the remote and moving the layers to the appropriate local location. It should also update the local configuration to match what is on the remote.

So if you get "Already up-to-date" nothing changed and nothing was updated. To test the updating, we need to make sure the configuration actually changes, and potentially even add another layer, then update, and then make sure the local sdk matches what we think it should based on the remote sdk we published.

Quoted 20 lines

Quoted 19 lines

Quoted 18 lines

meta/lib/oeqa/sdkext/sdk_update.py new file +4 -0

+        self.http_url = "http://127.0.0.1:%d" % self.http_service.port
+
+    def test_sdk_update_http(self):
+        output = self._run("devtool sdk-update \"%s\"" %

self.http_url)

meta/lib/oeqa/sdkext/sdk_update.py new file +3 -0

+
+#    def test_sdk_update_local(self):
+#        output = self._run("devtool sdk-update \"%s\"" %

self.publish_dir)

meta/lib/oeqa/sdkext/sdk_update.py new file +5 -0

+
+    @classmethod
+    def tearDownClass(self):
+        self.http_service.stop()
+        shutil.rmtree(self.publish_dir)