valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed tests to add auto field in SafeKeep

Browse Source 
try using name instead of eid do remote key
This commit is contained in:
Samuel M Smith 2014-05-16 15:09:09 -06:00
parent 6eadb11215
commit 0ce16b83c3
2 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/daemons/salting.py
View File

@ -155,7 +155,8 @@ class SaltSafe(object):
Clear the remote estate file
Override this in sub class to change uid
'''
mid = str(remote.eid)
#mid = str(remote.eid)
mid = remote.name
self.saltRaetKey.delete_key(mid)
def statusRemote(self, remote, verhex, pubhex, main=True):

64
salt/daemons/test/test_saltsafe.py
View File

@ -223,22 +223,29 @@ class BasicTestCase(unittest.TestCase):
'main': True,
'sid': 0})
self.assertDictEqual(main.safe.loadLocalData(), {'prihex': dataMain['prihex'],
'sighex': dataMain['sighex']})
'sighex': dataMain['sighex'],
'auto': True})
data1 = self.createRoadData(name='remote1', base=self.baseDirpath)
main.addRemote(estating.RemoteEstate(eid=3,
name=data1['name'],
ha=('127.0.0.1', 7532),
verkey=data1['verhex'],
pubkey=data1['pubhex']))
main.addRemote(estating.RemoteEstate(stack=main,
eid=3,
name=data1['name'],
ha=('127.0.0.1', 7532),
verkey=data1['verhex'],
pubkey=data1['pubhex'],
period=main.period,
offset=main.offset, ))
data2 = self.createRoadData(name='remote2', base=self.baseDirpath)
main.addRemote(estating.RemoteEstate(eid=4,
name=data2['name'],
ha=('127.0.0.1', 7533),
verkey=data2['verhex'],
pubkey=data2['pubhex']))
main.addRemote(estating.RemoteEstate(stack=main,
eid=4,
name=data2['name'],
ha=('127.0.0.1', 7533),
verkey=data2['verhex'],
pubkey=data2['pubhex'],
period=main.period,
offset=main.offset,))
main.dumpRemotes()
@ -301,21 +308,28 @@ class BasicTestCase(unittest.TestCase):
self.assertEqual(other.local.ha, ("0.0.0.0", raeting.RAET_TEST_PORT))
self.assertDictEqual(other.safe.loadLocalData(), {'prihex': dataOther['prihex'],
'sighex': dataOther['sighex']})
'sighex': dataOther['sighex'],
'auto': True,})
data3 = self.createRoadData(name='remote3', base=self.baseDirpath)
other.addRemote(estating.RemoteEstate(eid=3,
name=data3['name'],
ha=('127.0.0.1', 7534),
verkey=data3['verhex'],
pubkey=data3['pubhex']))
other.addRemote(estating.RemoteEstate(stack=other,
eid=3,
name=data3['name'],
ha=('127.0.0.1', 7534),
verkey=data3['verhex'],
pubkey=data3['pubhex'],
period=main.period,
offset=main.offset,))
data4 = self.createRoadData(name='remote4', base=self.baseDirpath)
other.addRemote(estating.RemoteEstate(eid=4,
name=data4['name'],
ha=('127.0.0.1', 7535),
verkey=data4['verhex'],
pubkey=data4['pubhex']))
other.addRemote(estating.RemoteEstate(stack=other,
eid=4,
name=data4['name'],
ha=('127.0.0.1', 7535),
verkey=data4['verhex'],
pubkey=data4['pubhex'],
period=main.period,
offset=main.offset,))
other.dumpRemotes()
self.assertDictEqual(other.safe.loadAllRemoteData(),
@ -376,7 +390,8 @@ class BasicTestCase(unittest.TestCase):
'main': True,
'sid': 0})
self.assertDictEqual(main.safe.loadLocalData(), {'prihex': dataMain['prihex'],
'sighex': dataMain['sighex']})
'sighex': dataMain['sighex'],
'auto': True,})
self.assertEqual(self.otherSafe.loadLocalData(), None)
self.assertEqual(self.otherSafe.loadAllRemoteData(), {})
@ -396,7 +411,8 @@ class BasicTestCase(unittest.TestCase):
self.assertTrue(other.safe.auto)
self.assertDictEqual(other.safe.loadLocalData(), {'prihex': dataOther['prihex'],
'sighex': dataOther['sighex']})
'sighex': dataOther['sighex'],
'auto': True,})
self.join(other, main)
self.assertEqual(len(main.transactions), 0)