summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Strachan <alistair.strachan@imgtec.com>2013-12-04 14:55:01 -0800
committerAlistair Strachan <alistair.strachan@imgtec.com>2013-12-04 14:57:22 -0800
commit8f76b6bedf5c0b316d02a9f9de3d504c0344cb81 (patch)
treee8f87d85cfe53228519f9e798dd1d26d9096999e
parent708602ccaad0f6e896c4bd4457503614b9ee81d0 (diff)
downloadframeworks_native-8f76b6bedf5c0b316d02a9f9de3d504c0344cb81.zip
frameworks_native-8f76b6bedf5c0b316d02a9f9de3d504c0344cb81.tar.gz
frameworks_native-8f76b6bedf5c0b316d02a9f9de3d504c0344cb81.tar.bz2
gui: Fix return code assert in CpuConsumer_test.
The CpuConsumer error code was changed recently from INVALID_OPERATION to NOT_ENOUGH_DATA, however the CpuConsumer_test was not updated. This change fixes the return code checked by CpuConsumer_test so the test no longer fails. Change-Id: Ie548ddcb313fa34c130ac63355090cb44ac15ebf
-rw-r--r--libs/gui/tests/CpuConsumer_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/tests/CpuConsumer_test.cpp b/libs/gui/tests/CpuConsumer_test.cpp
index afbc026..b370a2d 100644
--- a/libs/gui/tests/CpuConsumer_test.cpp
+++ b/libs/gui/tests/CpuConsumer_test.cpp
@@ -656,7 +656,7 @@ TEST_P(CpuConsumerTest, FromCpuLockMax) {
ALOGV("Locking frame %d (too many)", params.maxLockedBuffers);
CpuConsumer::LockedBuffer bTooMuch;
err = mCC->lockNextBuffer(&bTooMuch);
- ASSERT_TRUE(err == INVALID_OPERATION) << "Allowing too many locks";
+ ASSERT_TRUE(err == NOT_ENOUGH_DATA) << "Allowing too many locks";
ALOGV("Unlocking frame 0");
err = mCC->unlockBuffer(b[0]);