Merge "Increase timeout values for callback" into sc-dev (df1b8256) · Commits · e / os / android_hardware_interfaces

vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp

+9 −3

Original line number	Diff line number	Diff line
		@@ -276,7 +276,9 @@ TEST_P(VibratorAidl, ValidateEffectWithCallback) {
		if (!status.isOk())
		continue;

		std::chrono::milliseconds timeout{lengthMs * 2};
		//TODO(b/187207798): revert back to conservative timeout values once
		//latencies have been fixed
		std::chrono::milliseconds timeout{lengthMs * 8};
		EXPECT_EQ(completionFuture.wait_for(timeout), std::future_status::ready);
		}
		}
		@@ -588,7 +590,9 @@ TEST_P(VibratorAidl, ComposeCallback) {
		EXPECT_EQ(Status::EX_NONE, vibrator->compose(composite, callback).exceptionCode())
		<< toString(primitive);

		EXPECT_EQ(completionFuture.wait_for(duration * 2), std::future_status::ready)
		//TODO(b/187207798): revert back to conservative timeout values once
		//latencies have been fixed
		EXPECT_EQ(completionFuture.wait_for(duration * 4), std::future_status::ready)
		<< toString(primitive);
		end = high_resolution_clock::now();

		@@ -739,7 +743,9 @@ TEST_P(VibratorAidl, ComposeValidPwleWithCallback) {
		sp<CompletionCallback> callback =
		new CompletionCallback([&completionPromise] { completionPromise.set_value(); });
		uint32_t durationMs = 2100; // Sum of 2 active and 1 braking below
		std::chrono::milliseconds timeout{durationMs * 2};
		//TODO(b/187207798): revert back to conservative timeout values once
		//latencies have been fixed
		std::chrono::milliseconds timeout{durationMs * 4};

		ActivePwle active = composeValidActivePwle(vibrator, capabilities);