summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/layerindexlib/tests/restapi.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/layerindexlib/tests/restapi.py')
-rw-r--r--bitbake/lib/layerindexlib/tests/restapi.py18
1 files changed, 9 insertions, 9 deletions
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)