autotest: correct auto-fence tests

Tools/autotest/arducopter.py

@@ -1700,7 +1700,6 @@ def FenceFloorAutoDisableLanding(self):
             "FENCE_TYPE": 11,
             "FENCE_ALT_MIN": 10,
             "FENCE_ALT_MAX": 20,
-            "FENCE_ENABLE" : 1,
             "FENCE_AUTOENABLE" : 1,
         })
 
@@ -1710,7 +1709,6 @@ def FenceFloorAutoDisableLanding(self):
         self.user_takeoff(alt_min=15)
 
         # Check fence is enabled
-        self.do_fence_enable_except_floor()
         self.assert_fence_enabled()
 
         # Change to RC controlled mode
@@ -1725,15 +1723,11 @@ def FenceFloorAutoDisableLanding(self):
         self.wait_landed_and_disarmed(0)
         # the breach should have cleared since we auto-disable the
         # fence on landing
-        self.assert_fence_enabled()
-
-        # Assert fence is healthy now that we have landed disarmed
-        self.assert_sensor_state(fence_bit, healthy=True)
-
-        # Disable the fence using mavlink command to ensure cleaned up SITL state
-        self.do_fence_disable()
         self.assert_fence_disabled()
 
+        # Assert fences have gone now that we have landed and disarmed
+        self.assert_sensor_state(fence_bit, present=True, enabled=False)
+
     def FenceFloorAutoEnableOnArming(self):
         """Ensures we can auto-enable fences on arming and still takeoff and land"""