Merge "fup: Increase service_down_time beyond INITIAL_REPORTING_DELAY…

… in test"

nova/tests/functional/regressions/test_bug_1938326.py

@@ -35,7 +35,7 @@ def _setup_compute_service(self):
         # We want the service to be marked down in a reasonable time while
         # ensuring we don't accidentally mark services as down prematurely
         self.flags(report_interval=1)
-        self.flags(service_down_time=5)
+        self.flags(service_down_time=6)
 
         # Use two compute services to make it easier to assert the call from
         # the dest to the src, we could also test this for same host resize.