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

Rename methods for global properties

Browse Source 
Finally we've settled for `mgmt.property.`, instead of
`mgmt.global.property.` prefix.

QubesOS/qubes-issues#853
This commit is contained in:
Marek Marczykowski-Górecki 2017-03-11 00:58:53 +01:00
parent 435a465d70
commit f6e48cb3ff
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesmgmt/app.py
View File

@ -107,7 +107,7 @@ class QubesBase(qubesmgmt.base.PropertyHolder):
domains = None domains = None
def __init__(self): def __init__(self):
super(QubesBase, self).__init__(self, 'mgmt.global.property.', 'dom0') super(QubesBase, self).__init__(self, 'mgmt.property.', 'dom0')
self.domains = VMCollection(self) self.domains = VMCollection(self)

12
qubesmgmt/tests/tools/qubes_prefs.py
View File

@ -26,13 +26,13 @@ import qubesmgmt.tools.qubes_prefs
class TC_00_qubes_prefs(qubesmgmt.tests.QubesTestCase): class TC_00_qubes_prefs(qubesmgmt.tests.QubesTestCase):
def test_000_list(self): def test_000_list(self):
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'mgmt.global.property.List', None, None)] = \ ('dom0', 'mgmt.property.List', None, None)] = \
b'0\x00prop1\nprop2\n' b'0\x00prop1\nprop2\n'
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'mgmt.global.property.Get', 'prop1', None)] = \ ('dom0', 'mgmt.property.Get', 'prop1', None)] = \
b'0\x00default=True \'value1\'' b'0\x00default=True \'value1\''
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'mgmt.global.property.Get', 'prop2', None)] = \ ('dom0', 'mgmt.property.Get', 'prop2', None)] = \
b'0\x00default=False \'value2\'' b'0\x00default=False \'value2\''
with qubesmgmt.tests.tools.StdoutBuffer() as stdout: with qubesmgmt.tests.tools.StdoutBuffer() as stdout:
self.assertEqual(0, qubesmgmt.tools.qubes_prefs.main([], app=self.app)) self.assertEqual(0, qubesmgmt.tools.qubes_prefs.main([], app=self.app))
@ -43,7 +43,7 @@ class TC_00_qubes_prefs(qubesmgmt.tests.QubesTestCase):
def test_002_set_property(self): def test_002_set_property(self):
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'mgmt.global.property.Set', 'default_user', b'testuser')]\ ('dom0', 'mgmt.property.Set', 'default_user', b'testuser')]\
= b'0\x00' = b'0\x00'
self.assertEqual(0, qubesmgmt.tools.qubes_prefs.main([ self.assertEqual(0, qubesmgmt.tools.qubes_prefs.main([
'default_user', 'testuser'], app=self.app)) 'default_user', 'testuser'], app=self.app))
@ -51,7 +51,7 @@ class TC_00_qubes_prefs(qubesmgmt.tests.QubesTestCase):
def test_003_invalid_property(self): def test_003_invalid_property(self):
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'mgmt.global.property.Get', 'no_such_property', None)] = \ ('dom0', 'mgmt.property.Get', 'no_such_property', None)] = \
b'2\x00AttributeError\x00\x00no_such_property\x00' b'2\x00AttributeError\x00\x00no_such_property\x00'
with self.assertRaises(SystemExit): with self.assertRaises(SystemExit):
qubesmgmt.tools.qubes_prefs.main([ qubesmgmt.tools.qubes_prefs.main([
@ -60,7 +60,7 @@ class TC_00_qubes_prefs(qubesmgmt.tests.QubesTestCase):
def test_004_set_invalid_property(self): def test_004_set_invalid_property(self):
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'mgmt.global.property.Set', 'no_such_property', b'value')]\ ('dom0', 'mgmt.property.Set', 'no_such_property', b'value')]\
= b'2\x00AttributeError\x00\x00no_such_property\x00' = b'2\x00AttributeError\x00\x00no_such_property\x00'
with self.assertRaises(SystemExit): with self.assertRaises(SystemExit):
qubesmgmt.tools.qubes_prefs.main([ qubesmgmt.tools.qubes_prefs.main([