From b6699cf9b39a8dd9fe48d066193e190529b4689a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Fierek?= <Przemyslaw.Fierek@nordicsemi.no>
Date: Wed, 15 Feb 2017 18:10:21 +0100
Subject: [PATCH] Fix spurious failures in 5.1.x tests. (#1324)

---
 tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py           | 1 +
 tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py    | 1 +
 .../thread-cert/Cert_5_1_03_RouterAddressReallocation.py        | 1 +
 .../thread-cert/Cert_5_1_04_RouterAddressReallocation.py        | 1 +
 tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py   | 1 +
 tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py         | 1 +
 tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py          | 1 +
 .../scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py | 1 +
 tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py | 1 +
 .../scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py  | 1 +
 tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py  | 1 +
 tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py  | 1 +
 tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py            | 1 +
 tests/scripts/thread-cert/message.py                            | 2 +-
 14 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py b/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py
index ce18dfaee..893757a79 100755
--- a/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py
+++ b/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py
@@ -73,6 +73,7 @@ class Cert_5_1_01_RouterAttach(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER].start()
         time.sleep(7)
diff --git a/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py b/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py
index 5f0a6dc27..dd27e5e3c 100755
--- a/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py
+++ b/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py
@@ -88,6 +88,7 @@ class Cert_5_1_02_ChildAddressTimeout(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py b/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py
index 8bb23a834..74b4c0496 100755
--- a/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py
+++ b/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py
@@ -83,6 +83,7 @@ class Cert_5_1_03_RouterAddressReallocation(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER1].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py b/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py
index c7d31972e..23ee2e497 100755
--- a/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py
+++ b/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py
@@ -83,6 +83,7 @@ class Cert_5_1_04_RouterAddressReallocation(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER1].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py b/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py
index c967f3782..721ea8462 100755
--- a/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py
+++ b/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py
@@ -73,6 +73,7 @@ class Cert_5_1_05_RouterAddressTimeout(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER1].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py b/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py
index 7ff710173..921120f26 100755
--- a/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py
+++ b/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py
@@ -73,6 +73,7 @@ class Cert_5_1_06_RemoveRouterId(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER1].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py b/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py
index 221909600..7a96ad232 100755
--- a/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py
+++ b/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py
@@ -74,6 +74,7 @@ class Cert_5_1_07_MaxChildCount(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py b/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py
index bdedf178e..cedf76310 100755
--- a/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py
+++ b/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py
@@ -100,6 +100,7 @@ class Cert_5_1_08_RouterAttachConnectivity(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         for i in range(2, 6):
             self.nodes[i].start()
diff --git a/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py b/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py
index 5b44e8130..e7298c3f0 100755
--- a/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py
+++ b/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py
@@ -100,6 +100,7 @@ class Cert_5_1_09_REEDAttachConnectivity(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER1].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py
index 93416364f..95a78bb15 100755
--- a/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py
+++ b/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py
@@ -90,6 +90,7 @@ class Cert_5_1_10_RouterAttachLinkQuality(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER1].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py
index 9b8a55721..0a454594c 100755
--- a/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py
+++ b/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py
@@ -90,6 +90,7 @@ class Cert_5_1_11_REEDAttachLinkQuality(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[REED].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py b/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py
index f05be878d..3f1daf427 100755
--- a/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py
+++ b/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py
@@ -115,6 +115,7 @@ class Cert_5_1_12_NewRouterSync(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER1].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py b/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py
index c9ec20dd5..b9e3743a4 100755
--- a/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py
+++ b/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py
@@ -72,6 +72,7 @@ class Cert_5_1_13_RouterReset(unittest.TestCase):
         self.nodes[LEADER].start()
         self.nodes[LEADER].set_state('leader')
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
+        time.sleep(4)
 
         self.nodes[ROUTER].start()
         time.sleep(5)
diff --git a/tests/scripts/thread-cert/message.py b/tests/scripts/thread-cert/message.py
index ac4e39efa..7e84cc990 100644
--- a/tests/scripts/thread-cert/message.py
+++ b/tests/scripts/thread-cert/message.py
@@ -250,7 +250,7 @@ class Message(object):
         assert self.ipv6_packet.ipv6_header.hop_limit == hop_limit
 
     def __repr__(self):
-        return "Message(type={})".format(self.type)
+        return "Message(type={})".format(MessageType(self.type).name)
 
 
 class MessagesSet(object):