summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/bldcontrol/sshbecontroller.py
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-05-20 15:41:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 11:59:46 +0100
commit3480be741ec7bc8fe5b8684e1926447183c6f2c2 (patch)
treed3ea14e5956c2891650c03aaaa49c8c4e3adfffe /bitbake/lib/toaster/bldcontrol/sshbecontroller.py
parent22a0d8aab2db31a4276bd523f484936efe3f0410 (diff)
downloadpoky-3480be741ec7bc8fe5b8684e1926447183c6f2c2.tar.gz
bitbake: bldcontrol: Fix all failing unit tests
This fixes the unit tests for the bldcontrol it requires the implementation of a new Exception type so that a known Exception can be handled. Also fixed is the path to the toaster conf files so that the test doesn't need to be run from the top level directory and the ability to specify the values of TTS_SOURCE_DIR and TTS_BUILD_DIR and TTS_TEST_ADDRESS used for testing. Edited by Alex Damian to correct the rebasing of the localhostbecontroller.py file. (Bitbake rev: c17933271cd273a346115c2ee0b6695ff3f981ce) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/sshbecontroller.py')
-rw-r--r--bitbake/lib/toaster/bldcontrol/sshbecontroller.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/sshbecontroller.py b/bitbake/lib/toaster/bldcontrol/sshbecontroller.py
index 11ad08d440..29ed0a770f 100644
--- a/bitbake/lib/toaster/bldcontrol/sshbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/sshbecontroller.py
@@ -31,6 +31,9 @@ from toastermain import settings
31 31
32from bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException 32from bbcontroller import BuildEnvironmentController, ShellCmdException, BuildSetupException
33 33
34class NotImplementedException(Exception):
35 pass
36
34def DN(path): 37def DN(path):
35 return "/".join(path.split("/")[0:-1]) 38 return "/".join(path.split("/")[0:-1])
36 39
@@ -125,7 +128,7 @@ class SSHBEController(BuildEnvironmentController):
125 # set layers in the layersource 128 # set layers in the layersource
126 129
127 130
128 raise Exception("Not implemented: SSH setLayers") 131 raise NotImplementedException("Not implemented: SSH setLayers")
129 # 3. configure the build environment, so we have a conf/bblayers.conf 132 # 3. configure the build environment, so we have a conf/bblayers.conf
130 assert self.pokydirname is not None 133 assert self.pokydirname is not None
131 self._setupBE() 134 self._setupBE()