Merge pull request #235 from openweave/jexie/simplify_wdm_tests

simplify wdm tests

Author: robszewczyk

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_01.py

@@ -66,8 +66,7 @@ def test_weave_wdm_next_application_key_01(self):
                                              ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[35:].upper()
-        wdm_next_args['test_case_name'] = ['A01: Mutual Subscribe: Application key: Key distribution',
-                                           'B01: Stress Mutual Subscribe: Application key: Key distribution']
+        wdm_next_args['test_case_name'] = ['B01: Stress Mutual Subscribe: Application key: Key distribution']
         print 'test file: ' + self.__class__.__name__
         print "test_weave_wdm_next_application_key test A01 and B01"
         super(test_weave_wdm_next_application_key_01, self).weave_wdm_next_test_base(wdm_next_args)

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_application_key_02.py

@@ -65,8 +65,7 @@ def test_weave_wdm_next_application_key_02(self):
                                              ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[35:].upper()
-        wdm_next_args['test_case_name'] = ['A02: Mutual Subscribe: Application key: Group key',
-                                           'B02: Stress Mutual Subscribe: Application key: Group key']
+        wdm_next_args['test_case_name'] = ['B02: Stress Mutual Subscribe: Application key: Group key']
         print 'test file: ' + self.__class__.__name__
         print "test_weave_wdm_next_application_key test A02 and B02"
         if "WEAVE_SYSTEM_CONFIG_USE_LWIP" in os.environ.keys() and os.environ["WEAVE_SYSTEM_CONFIG_USE_LWIP"] == "1":

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_01.py

@@ -64,8 +64,7 @@ def test_weave_wdm_next_mutual_subscribe_01(self):
                                              ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['E01: Mutual Subscribe: Root path. Null Version. Client in initiator cancels',
-                                           'M01: Stress Mutual Subscribe: Root path. Null Version. Client in initiator cancels'
+        wdm_next_args['test_case_name'] = ['M01: Stress Mutual Subscribe: Root path. Null Version. Client in initiator cancels'
         ]
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E01 and M01"

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_02.py

@@ -65,8 +65,7 @@ def test_weave_wdm_next_mutual_subscribe_02(self):
                                              ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['E02: Mutual Subscribe: Root path. Null Version, Publisher in initiator cancels',
-                                           'M02: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator cancels']
+        wdm_next_args['test_case_name'] = ['M02: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E02 and M02"
         super(test_weave_wdm_next_mutual_subscribe_02, self).weave_wdm_next_test_base(wdm_next_args)

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_03.py

@@ -65,8 +65,7 @@ def test_weave_wdm_next_mutual_subscribe_03(self):
                                              ('Client->kEvent_OnNotificationProcessed', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['E03: Mutual Subscribe: Root path. Null Version. Client in initiator aborts',
-                                           'M03: Stress Mutual Subscribe: Root path. Null Version. Client in initiator aborts']
+        wdm_next_args['test_case_name'] = ['M03: Stress Mutual Subscribe: Root path. Null Version. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E03 and M03"
         super(test_weave_wdm_next_mutual_subscribe_03, self).weave_wdm_next_test_base(wdm_next_args)

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_04.py

@@ -65,8 +65,7 @@ def test_weave_wdm_next_mutual_subscribe_04(self):
                                              ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['E04: Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts',
-                                           'M04: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts']
+        wdm_next_args['test_case_name'] = ['M04: Stress Mutual Subscribe: Root path. Null Version. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test E04 and M04"
         super(test_weave_wdm_next_mutual_subscribe_04, self).weave_wdm_next_test_base(wdm_next_args)

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_05.py

@@ -64,8 +64,7 @@ def test_weave_wdm_next_mutual_subscribe_05(self):
                                              ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)',wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F01: Mutual Subscribe: Root path. Null Version. Idle. Client in initiator cancels',
-                                           'M05: Stress Mutual Subscribe: Root path. Null Version. Idle, Client in initiator cancels']
+        wdm_next_args['test_case_name'] = ['M05: Stress Mutual Subscribe: Root path. Null Version. Idle, Client in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F01 and M05"
         super(test_weave_wdm_next_mutual_subscribe_05, self).weave_wdm_next_test_base(wdm_next_args)

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_06.py

@@ -64,8 +64,7 @@ def test_weave_wdm_next_mutual_subscribe_06(self):
                                              ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F02: Mutual Subscribe: Root path. Null Version, Idle. Publisher in initiator cancels',
-                                           'M06: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels']
+        wdm_next_args['test_case_name'] = ['M06: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator cancels']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F02 and M06"
         super(test_weave_wdm_next_mutual_subscribe_06, self).weave_wdm_next_test_base(wdm_next_args)

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_07.py

@@ -65,8 +65,7 @@ def test_weave_wdm_next_mutual_subscribe_07(self):
                                              ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F03: Mutual Susbscribe: Root path. Null Version. Idle. Client in initiator aborts',
-                                           'M07: Stress Mutual Susbscribe: Root path. Null Version. Idle. Client in initiator aborts']
+        wdm_next_args['test_case_name'] = ['M07: Stress Mutual Susbscribe: Root path. Null Version. Idle. Client in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F03 and M07"
         super(test_weave_wdm_next_mutual_subscribe_07, self).weave_wdm_next_test_base(wdm_next_args)

src/test-apps/happy/tests/standalone/wdmNext/test_weave_wdm_next_mutual_subscribe_08.py

@@ -65,8 +65,7 @@ def test_weave_wdm_next_mutual_subscribe_08(self):
                                              ('Client\[0\] moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations']),
                                              ('Handler\[0\] Moving to \[ FREE\] Ref\(0\)', wdm_next_args['test_client_iterations'])]
         wdm_next_args['test_tag'] = self.__class__.__name__[19:].upper()
-        wdm_next_args['test_case_name'] = ['F04: Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts',
-                                           'M08: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts']
+        wdm_next_args['test_case_name'] = ['M08: Stress Mutual Subscribe: Root path. Null Version. Idle. Publisher in initiator aborts']
         print 'test file: ' + self.__class__.__name__
         print "weave-wdm-next test F04 and M08"
         super(test_weave_wdm_next_mutual_subscribe_08, self).weave_wdm_next_test_base(wdm_next_args)