diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2021-02-09 09:50:21 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-10 23:48:16 +0000 |
commit | 75f87db413f3659fee18eff389b7b339b01cce15 (patch) | |
tree | e733135549b516c72c4f34172b6bbf865377fc76 /bitbake/lib/layerindexlib/tests | |
parent | 7283a0b3b6ca49d0d2e13593333a580ef10439a8 (diff) | |
download | poky-75f87db413f3659fee18eff389b7b339b01cce15.tar.gz |
bitbake: logging: Make bitbake logger compatible with python logger
The bitbake logger overrode the definition of the debug() logging call
to include a debug level, but this causes problems with code that may
be using standard python logging, since the extra argument is
interpreted differently.
Instead, change the bitbake loggers debug() call to match the python
logger call and add a debug2() and debug3() API to replace calls that
were logging to a different debug level.
[RP: Small fix to ensure bb.debug calls bbdebug()]
(Bitbake rev: f68682a79d83e6399eb403f30a1f113516575f51)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/layerindexlib/tests')
-rw-r--r-- | bitbake/lib/layerindexlib/tests/cooker.py | 4 | ||||
-rw-r--r-- | bitbake/lib/layerindexlib/tests/restapi.py | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/bitbake/lib/layerindexlib/tests/cooker.py b/bitbake/lib/layerindexlib/tests/cooker.py index 1d0685e099..5ddf89aa21 100644 --- a/bitbake/lib/layerindexlib/tests/cooker.py +++ b/bitbake/lib/layerindexlib/tests/cooker.py | |||
@@ -72,7 +72,7 @@ class LayerIndexCookerTest(LayersTest): | |||
72 | 72 | ||
73 | def test_find_collection(self): | 73 | def test_find_collection(self): |
74 | def _check(collection, expected): | 74 | def _check(collection, expected): |
75 | self.logger.debug(1, "Looking for collection %s..." % collection) | 75 | self.logger.debug("Looking for collection %s..." % collection) |
76 | result = self.layerindex.find_collection(collection) | 76 | result = self.layerindex.find_collection(collection) |
77 | if expected: | 77 | if expected: |
78 | self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection) | 78 | self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection) |
@@ -91,7 +91,7 @@ class LayerIndexCookerTest(LayersTest): | |||
91 | 91 | ||
92 | def test_find_layerbranch(self): | 92 | def test_find_layerbranch(self): |
93 | def _check(name, expected): | 93 | def _check(name, expected): |
94 | self.logger.debug(1, "Looking for layerbranch %s..." % name) | 94 | self.logger.debug("Looking for layerbranch %s..." % name) |
95 | result = self.layerindex.find_layerbranch(name) | 95 | result = self.layerindex.find_layerbranch(name) |
96 | if expected: | 96 | if expected: |
97 | self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection) | 97 | self.assertIsNotNone(result, msg="Did not find %s when it shouldn't be there" % collection) |
diff --git a/bitbake/lib/layerindexlib/tests/restapi.py b/bitbake/lib/layerindexlib/tests/restapi.py index 4646d01f9f..33b5c1c4c8 100644 --- a/bitbake/lib/layerindexlib/tests/restapi.py +++ b/bitbake/lib/layerindexlib/tests/restapi.py | |||
@@ -57,11 +57,11 @@ class LayerIndexWebRestApiTest(LayersTest): | |||
57 | type in self.layerindex.indexes[0].config['local']: | 57 | type in self.layerindex.indexes[0].config['local']: |
58 | continue | 58 | continue |
59 | for id in getattr(self.layerindex.indexes[0], type): | 59 | for id in getattr(self.layerindex.indexes[0], type): |
60 | self.logger.debug(1, "type %s" % (type)) | 60 | self.logger.debug("type %s" % (type)) |
61 | 61 | ||
62 | self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number not in reloaded index") | 62 | self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number not in reloaded index") |
63 | 63 | ||
64 | self.logger.debug(1, "%s ? %s" % (getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id])) | 64 | self.logger.debug("%s ? %s" % (getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id])) |
65 | 65 | ||
66 | self.assertEqual(getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id], msg="Reloaded contents different") | 66 | self.assertEqual(getattr(self.layerindex.indexes[0], type)[id], getattr(reload.indexes[0], type)[id], msg="Reloaded contents different") |
67 | 67 | ||
@@ -80,11 +80,11 @@ class LayerIndexWebRestApiTest(LayersTest): | |||
80 | type in self.layerindex.indexes[0].config['local']: | 80 | type in self.layerindex.indexes[0].config['local']: |
81 | continue | 81 | continue |
82 | for id in getattr(self.layerindex.indexes[0] ,type): | 82 | for id in getattr(self.layerindex.indexes[0] ,type): |
83 | self.logger.debug(1, "type %s" % (type)) | 83 | self.logger.debug("type %s" % (type)) |
84 | 84 | ||
85 | self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number missing from reloaded data") | 85 | self.assertTrue(id in getattr(reload.indexes[0], type), msg="Id number missing from reloaded data") |
86 | 86 | ||
87 | self.logger.debug(1, "%s ? %s" % (getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id])) | 87 | self.logger.debug("%s ? %s" % (getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id])) |
88 | 88 | ||
89 | self.assertEqual(getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id], msg="reloaded data does not match original") | 89 | self.assertEqual(getattr(self.layerindex.indexes[0] ,type)[id], getattr(reload.indexes[0], type)[id], msg="reloaded data does not match original") |
90 | 90 | ||
@@ -111,14 +111,14 @@ class LayerIndexWebRestApiTest(LayersTest): | |||
111 | if dep.layer.name == 'meta-python': | 111 | if dep.layer.name == 'meta-python': |
112 | break | 112 | break |
113 | else: | 113 | else: |
114 | self.logger.debug(1, "meta-python was not found") | 114 | self.logger.debug("meta-python was not found") |
115 | raise self.failureException | 115 | raise self.failureException |
116 | 116 | ||
117 | # Only check the first element... | 117 | # Only check the first element... |
118 | break | 118 | break |
119 | else: | 119 | else: |
120 | # Empty list, this is bad. | 120 | # Empty list, this is bad. |
121 | self.logger.debug(1, "Empty list of dependencies") | 121 | self.logger.debug("Empty list of dependencies") |
122 | self.assertIsNotNone(first, msg="Empty list of dependencies") | 122 | self.assertIsNotNone(first, msg="Empty list of dependencies") |
123 | 123 | ||
124 | # Last dep should be the requested item | 124 | # Last dep should be the requested item |
@@ -128,7 +128,7 @@ class LayerIndexWebRestApiTest(LayersTest): | |||
128 | @skipIfNoNetwork() | 128 | @skipIfNoNetwork() |
129 | def test_find_collection(self): | 129 | def test_find_collection(self): |
130 | def _check(collection, expected): | 130 | def _check(collection, expected): |
131 | self.logger.debug(1, "Looking for collection %s..." % collection) | 131 | self.logger.debug("Looking for collection %s..." % collection) |
132 | result = self.layerindex.find_collection(collection) | 132 | result = self.layerindex.find_collection(collection) |
133 | if expected: | 133 | if expected: |
134 | self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection) | 134 | self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection) |
@@ -148,11 +148,11 @@ class LayerIndexWebRestApiTest(LayersTest): | |||
148 | @skipIfNoNetwork() | 148 | @skipIfNoNetwork() |
149 | def test_find_layerbranch(self): | 149 | def test_find_layerbranch(self): |
150 | def _check(name, expected): | 150 | def _check(name, expected): |
151 | self.logger.debug(1, "Looking for layerbranch %s..." % name) | 151 | self.logger.debug("Looking for layerbranch %s..." % name) |
152 | 152 | ||
153 | for index in self.layerindex.indexes: | 153 | for index in self.layerindex.indexes: |
154 | for layerbranchid in index.layerBranches: | 154 | for layerbranchid in index.layerBranches: |
155 | self.logger.debug(1, "Present: %s" % index.layerBranches[layerbranchid].layer.name) | 155 | self.logger.debug("Present: %s" % index.layerBranches[layerbranchid].layer.name) |
156 | result = self.layerindex.find_layerbranch(name) | 156 | result = self.layerindex.find_layerbranch(name) |
157 | if expected: | 157 | if expected: |
158 | self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection) | 158 | self.assertIsNotNone(result, msg="Did not find %s when it should be there" % collection) |