Merge pull request #1847 from peternewman/0.10-c11-compat

Fix some minor longstanding RDM test bugs

include/ola/client/Module.h

@@ -24,7 +24,7 @@
  * Sometimes it's useful for client applications to avoid linking against
  * libola, say for instance if they install separately from OLA. By deferring
  * the linking and using libola as a plugin, clients can use OLA if it's
- * installed on the system or if not, take some other action like displaing a
+ * installed on the system or if not, take some other action like displaying a
  * message or using another output mechanism.
  *
  * This file provides plugin interfaces so that a client code can load

tools/rdm/TestDefinitions.py

@@ -4458,8 +4458,8 @@ def VerifyResult(self, response, fields):
     self.SetProperty('dmx_fail_settings', fields)
 
 
-class GetFailUpModeWithData(TestMixins.GetWithDataMixin,
-                             OptionalParameterTestFixture):
+class GetDmxFailModeWithExtraData(TestMixins.GetWithDataMixin,
+                                  OptionalParameterTestFixture):
   """GET DMX_FAIL_MODE with extra data."""
   CATEGORY = TestCategory.ERROR_CONDITIONS
   PID = 'DMX_FAIL_MODE'
@@ -4482,8 +4482,8 @@ def Test(self):
     self.SendSet(
         ROOT_DEVICE, self.pid,
         [settings.get('scene_number', 0),
-         settings.get('hold_time', 0),
          settings.get('loss_of_signal_delay', 0),
+         settings.get('hold_time', 0),
          settings.get('level', 0)]
     )
 
@@ -4698,8 +4698,8 @@ def GetFailMode(self):
     self.SendGet(ROOT_DEVICE, self.pid)
 
 
-class SetFailModeWithNoData(TestMixins.SetWithNoDataMixin,
-                            OptionalParameterTestFixture):
+class SetDmxFailModeWithNoData(TestMixins.SetWithNoDataMixin,
+                               OptionalParameterTestFixture):
   """Set DMX_FAIL_MODE with no data."""
   CATEGORY = TestCategory.ERROR_CONDITIONS
   PID = 'DMX_FAIL_MODE'
@@ -4730,8 +4730,8 @@ def VerifyResult(self, response, fields):
     self.SetProperty('dmx_startup_settings', fields)
 
 
-class GetStartUpModeWithData(TestMixins.GetWithDataMixin,
-                             OptionalParameterTestFixture):
+class GetStartupModeWithExtraData(TestMixins.GetWithDataMixin,
+                                  OptionalParameterTestFixture):
   """Get DMX_STARTUP_MODE with extra data."""
   CATEGORY = TestCategory.ERROR_CONDITIONS
   PID = 'DMX_STARTUP_MODE'
@@ -4740,7 +4740,7 @@ class GetStartUpModeWithData(TestMixins.GetWithDataMixin,
 class SetDmxStartupMode(OptionalParameterTestFixture):
   """Set DMX_STARTUP_MODE without changing the settings."""
   CATEGORY = TestCategory.DMX_SETUP
-  PID = 'DMX_FAIL_MODE'
+  PID = 'DMX_STARTUP_MODE'
   PROVIDES = ['set_dmx_startup_mode_supported']
   REQUIRES = ['dmx_startup_settings']
 
@@ -4754,8 +4754,8 @@ def Test(self):
     self.SendSet(
         ROOT_DEVICE, self.pid,
         [settings.get('scene_number', 0),
-         settings.get('hold_time', 0),
          settings.get('startup_delay', 0),
+         settings.get('hold_time', 0),
          settings.get('level', 0)]
     )
 
@@ -4971,8 +4971,8 @@ def GetStartupMode(self):
     self.SendGet(ROOT_DEVICE, self.pid)
 
 
-class SetStartupModeWithNoData(TestMixins.SetWithNoDataMixin,
-                               OptionalParameterTestFixture):
+class SetDmxStartupModeWithNoData(TestMixins.SetWithNoDataMixin,
+                                  OptionalParameterTestFixture):
   """Set DMX_STARTUP_MODE with no data."""
   CATEGORY = TestCategory.ERROR_CONDITIONS
   PID = 'DMX_STARTUP_MODE'

tools/rdm/TestMixins.py

@@ -754,7 +754,7 @@ def ResetState(self):
       self.SetBroken('Failed to restore DMX_FAIL_MODE settings')
       return
 
-    for key in ('scene_number', 'hold_time', 'loss_of_signal_delay', 'level'):
+    for key in ('scene_number', 'loss_of_signal_delay', 'hold_time', 'level'):
       if key not in settings:
         self.SetBroken(
             'Failed to restore DMX_FAIL_MODE settings, missing %s' % key)
@@ -784,7 +784,7 @@ def ResetState(self):
       self.SetBroken('Failed to restore DMX_STARTUP_MODE settings')
       return
 
-    for key in ('scene_number', 'hold_time', 'startup_delay', 'level'):
+    for key in ('scene_number', 'startup_delay', 'hold_time', 'level'):
       if key not in settings:
         self.SetBroken(
             'Failed to restore DMX_STARTUP_MODE settings, missing %s' % key)