Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpc-window: adjust for python3

Browse Source 
dict.keys() is not indexable.

QubesOS/qubes-issues#910
This commit is contained in:
Marek Marczykowski-Górecki 2017-03-24 01:43:22 +01:00
parent ab1bd77b45
commit 20a1853f3f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
qubespolicy/tests/gtkhelpers.py
View File

@ -176,18 +176,20 @@ class VMListModelerTest(VMListModelerMock, unittest.TestCase):
self.apply_model(combo) self.apply_model(combo)
self.assertEquals(7, len(combo.get_model())) self.assertEquals(7, len(combo.get_model()))
names = list(self._entries.keys())
self.apply_model(combo, [ self.apply_model(combo, [
VMListModeler.NameBlacklistFilter([self._entries.keys()[0]])]) VMListModeler.NameBlacklistFilter([names[0]])])
self.assertEquals(6, len(combo.get_model())) self.assertEquals(6, len(combo.get_model()))
self.apply_model(combo, [ self.apply_model(combo, [
VMListModeler.NameBlacklistFilter([self._entries.keys()[0]]), VMListModeler.NameBlacklistFilter([names[0]]),
VMListModeler.NameBlacklistFilter([self._entries.keys()[1]])]) VMListModeler.NameBlacklistFilter([names[1]])])
self.assertEquals(5, len(combo.get_model())) self.assertEquals(5, len(combo.get_model()))
self.apply_model(combo, [VMListModeler.NameBlacklistFilter([ self.apply_model(combo, [VMListModeler.NameBlacklistFilter([
self._entries.keys()[0], names[0],
self._entries.keys()[1] names[1]
])]) ])])
self.assertEquals(5, len(combo.get_model())) self.assertEquals(5, len(combo.get_model()))
@ -197,13 +199,15 @@ class VMListModelerTest(VMListModelerMock, unittest.TestCase):
self.apply_model(combo) self.apply_model(combo)
self.assertEquals(7, len(combo.get_model())) self.assertEquals(7, len(combo.get_model()))
names = list(self._entries.keys())
self.apply_model(combo, [ self.apply_model(combo, [
VMListModeler.NameWhitelistFilter([self._entries.keys()[0]])]) VMListModeler.NameWhitelistFilter([names[0]])])
self.assertEquals(1, len(combo.get_model())) self.assertEquals(1, len(combo.get_model()))
self.apply_model(combo, [VMListModeler.NameWhitelistFilter([ self.apply_model(combo, [VMListModeler.NameWhitelistFilter([
self._entries.keys()[0], names[0],
self._entries.keys()[1]])]) names[1]])])
self.assertEquals(2, len(combo.get_model())) self.assertEquals(2, len(combo.get_model()))
def test_apply_model_multiple_filters(self): def test_apply_model_multiple_filters(self):
@ -212,15 +216,16 @@ class VMListModelerTest(VMListModelerMock, unittest.TestCase):
self.apply_model(combo) self.apply_model(combo)
self.assertEquals(7, len(combo.get_model())) self.assertEquals(7, len(combo.get_model()))
names = list(self._entries.keys())
self.apply_model(combo, [VMListModeler.NameWhitelistFilter([ self.apply_model(combo, [VMListModeler.NameWhitelistFilter([
self._entries.keys()[0], names[0],
self._entries.keys()[1], names[1],
self._entries.keys()[2], names[2],
self._entries.keys()[3], names[3],
self._entries.keys()[4]]), names[4]]),
VMListModeler.NameBlacklistFilter([ VMListModeler.NameBlacklistFilter([
self._entries.keys()[0], names[0],
self._entries.keys()[1]])]) names[1]])])
self.assertEquals(3, len(combo.get_model())) self.assertEquals(3, len(combo.get_model()))
def test_apply_icon(self): def test_apply_icon(self):