summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2015-03-09 12:35:45 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2015-03-09 12:35:45 +0100
commit65a42a4999ae080c9b8d040404150ae58b44b533 (patch)
tree6d5f74c7e7a058e1bdd518cf4aab1dac4bc652b3 /test
parent43a5d42eeaccb08b7703e01e326e397ed3cd4ac2 (diff)
parentc9b2ba6558c8212e59bd3701a2e26744caead33b (diff)
downloaduca-65a42a4999ae080c9b8d040404150ae58b44b533.tar.gz
uca-65a42a4999ae080c9b8d040404150ae58b44b533.tar.bz2
uca-65a42a4999ae080c9b8d040404150ae58b44b533.tar.xz
uca-65a42a4999ae080c9b8d040404150ae58b44b533.zip
Merge pull request #64 from ufo-kit/WriteRestrictionPolicy
Write restriction policy
Diffstat (limited to 'test')
-rw-r--r--test/test-mock.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/test-mock.c b/test/test-mock.c
index 5573666..3fc8988 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -285,8 +285,12 @@ test_can_be_written (Fixture *fixture, gconstpointer data)
uca_camera_set_writable (fixture->camera, "roi-height", TRUE);
uca_camera_start_recording (fixture->camera, &error);
g_assert_no_error (error);
-
g_object_set (fixture->camera, "roi-height", 128, NULL);
+#if (GLIB_CHECK_VERSION (2, 34, 0))
+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Property 'exposure-time' cant be changed during acquisition");
+ g_object_set (fixture->camera, "exposure-time", 1.0, NULL);
+ g_test_assert_expected_messages ();
+#endif
uca_camera_stop_recording (fixture->camera, &error);
g_assert_no_error (error);
}