Revision 2e5c33db test/ganeti.cli_unittest.py
b/test/ganeti.cli_unittest.py | ||
---|---|---|
765 | 765 |
def CountPending(self): |
766 | 766 |
return len(self._query) |
767 | 767 |
|
768 |
def Query(self, res, fields, filter_):
|
|
768 |
def Query(self, res, fields, qfilter):
|
|
769 | 769 |
if res != constants.QR_NODE: |
770 | 770 |
raise Exception("Querying wrong resource") |
771 | 771 |
|
... | ... | |
774 | 774 |
if exp_fields != fields: |
775 | 775 |
raise Exception("Expected fields %s, got %s" % (exp_fields, fields)) |
776 | 776 |
|
777 |
if not (filter_ is None or check_filter(filter_)):
|
|
777 |
if not (qfilter is None or check_filter(qfilter)):
|
|
778 | 778 |
raise Exception("Filter doesn't match expectations") |
779 | 779 |
|
780 | 780 |
return objects.QueryResponse(fields=None, data=result) |
... | ... | |
804 | 804 |
def testNoMaster(self): |
805 | 805 |
cl = self._FakeClient() |
806 | 806 |
|
807 |
def _CheckFilter(filter_):
|
|
808 |
self.assertEqual(filter_, [qlang.OP_NOT, [qlang.OP_TRUE, "master"]])
|
|
807 |
def _CheckFilter(qfilter):
|
|
808 |
self.assertEqual(qfilter, [qlang.OP_NOT, [qlang.OP_TRUE, "master"]])
|
|
809 | 809 |
return True |
810 | 810 |
|
811 | 811 |
cl.AddQueryResult(["name", "offline", "sip"], _CheckFilter, [ |
... | ... | |
835 | 835 |
def testNoMasterFilterNodeName(self): |
836 | 836 |
cl = self._FakeClient() |
837 | 837 |
|
838 |
def _CheckFilter(filter_):
|
|
839 |
self.assertEqual(filter_,
|
|
838 |
def _CheckFilter(qfilter):
|
|
839 |
self.assertEqual(qfilter,
|
|
840 | 840 |
[qlang.OP_AND, |
841 | 841 |
[qlang.OP_OR] + [[qlang.OP_EQUAL, "name", name] |
842 | 842 |
for name in ["node2", "node3"]], |
... | ... | |
877 | 877 |
def testNodeGroup(self): |
878 | 878 |
cl = self._FakeClient() |
879 | 879 |
|
880 |
def _CheckFilter(filter_):
|
|
881 |
self.assertEqual(filter_,
|
|
880 |
def _CheckFilter(qfilter):
|
|
881 |
self.assertEqual(qfilter,
|
|
882 | 882 |
[qlang.OP_OR, [qlang.OP_EQUAL, "group", "foobar"], |
883 | 883 |
[qlang.OP_EQUAL, "group.uuid", "foobar"]]) |
884 | 884 |
return True |
Also available in: Unified diff