fix delaytimer issue and update cert scripts (#1474)

This commit is contained in:
rongli
2017-03-17 09:36:07 +08:00
committed by Jonathan Hui
parent 9a175befed
commit a182228f72
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -505,7 +505,7 @@ ThreadError DatasetManager::Set(Coap::Header &aHeader, Message &aMessage, const
case Tlv::kDelayTimer:
{
DelayTimerTlv *delayTimerTlv = reinterpret_cast<DelayTimerTlv *>(&tlv);
DelayTimerTlv *delayTimerTlv = static_cast<DelayTimerTlv *>(&data.tlv);
if (doesAffectMasterKey && delayTimerTlv->GetDelayTimer() < DelayTimerTlv::kDelayTimerDefault)
{
@@ -111,7 +111,7 @@ class Cert_9_2_7_DelayTimer(unittest.TestCase):
delay_timer=10000,
channel=COMMISSIONER_PENDING_CHANNEL,
panid=COMMISSIONER_PENDING_PANID)
time.sleep(20)
time.sleep(40)
self.assertEqual(self.nodes[LEADER].get_panid(), COMMISSIONER_PENDING_PANID)
self.assertEqual(self.nodes[COMMISSIONER].get_panid(), COMMISSIONER_PENDING_PANID)
self.assertEqual(self.nodes[ROUTER].get_panid(), COMMISSIONER_PENDING_PANID)
@@ -112,7 +112,7 @@ class Cert_9_2_11_MasterKey(unittest.TestCase):
active_timestamp=70,
delay_timer=10000,
master_key=KEY2)
time.sleep(15)
time.sleep(310)
print(self.nodes[COMMISSIONER].get_masterkey())
print(self.nodes[LEADER].get_masterkey())
@@ -135,7 +135,7 @@ class Cert_9_2_11_MasterKey(unittest.TestCase):
active_timestamp=30,
delay_timer=10000,
master_key=KEY1)
time.sleep(15)
time.sleep(310)
print(self.nodes[COMMISSIONER].get_masterkey())
print(self.nodes[LEADER].get_masterkey())
@@ -132,7 +132,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(unittest.TestCase):
delay_timer=20000,
network_name='MyHouse',
master_key=KEY2)
time.sleep(25)
time.sleep(310)
self.assertEqual(self.nodes[COMMISSIONER].get_masterkey(), KEY2)
self.assertEqual(self.nodes[LEADER].get_masterkey(), KEY2)