diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-07-21 14:43:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-26 08:10:36 +0100 |
commit | bb260e94a63d6d498c9c76b862bc836a90678495 (patch) | |
tree | 9fe719213c79a999e5d5eb7e4c28da926c56db6f /bitbake/lib/toaster/bldcontrol/management | |
parent | ef627d0ab8f5cf2fc72005393e76047cb623ff3d (diff) | |
download | poky-bb260e94a63d6d498c9c76b862bc836a90678495.tar.gz |
bitbake: toaster: tests: Remove references to LayerSource model
Remove and replace layersource model references in the tests and test
data. Remove the orm/test as this only tested LayerSource interactions
which have now been removed.
(Bitbake rev: 61a47cbc92c856690cb0e8da7102b2e669eaee0a)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/management')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py index 6f08f1db80..1f57fc16f1 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py | |||
@@ -9,24 +9,6 @@ from .checksettings import DN | |||
9 | import logging | 9 | import logging |
10 | logger = logging.getLogger("toaster") | 10 | logger = logging.getLogger("toaster") |
11 | 11 | ||
12 | def _reduce_canon_path(path): | ||
13 | components = [] | ||
14 | for c in path.split("/"): | ||
15 | if c == "..": | ||
16 | del components[-1] | ||
17 | elif c == ".": | ||
18 | pass | ||
19 | else: | ||
20 | components.append(c) | ||
21 | if len(components) < 2: | ||
22 | components.append('') | ||
23 | return "/".join(components) | ||
24 | |||
25 | def _get_id_for_sourcetype(s): | ||
26 | for i in LayerSource.SOURCE_TYPE: | ||
27 | if s == i[1]: | ||
28 | return i[0] | ||
29 | raise Exception("Could not find definition for sourcetype '%s'. Valid source types are %s" % (str(s), ', '.join(map(lambda x: "'%s'" % x[1], LayerSource.SOURCE_TYPE )))) | ||
30 | 12 | ||
31 | class Command(BaseCommand): | 13 | class Command(BaseCommand): |
32 | help = "Loads a toasterconf.json file in the database" | 14 | help = "Loads a toasterconf.json file in the database" |