[farsight2/master] tests: Fail keyfile test if can't load file

[Olivier Crête]

Fail the tests if it can't load the keyfile

Also add the keyfile..
---
 tests/check/Makefile.am      |    3 ++-
 tests/check/utils/binadded.c |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index ffc36ca..878c1ba 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -34,7 +34,8 @@ SUPPRESSIONS = $(top_srcdir)/common/gst.supp
 EXTRA_DIST = \
 	upnp/InternetGatewayDevice.xml \
 	upnp/WANIPConnection.xml \
-	base/test1.conf
+	base/test1.conf \
+	utils/gstelements.conf
 
 #######
 # From here.. Its a list of our tests and their sub stuff
diff --git a/tests/check/utils/binadded.c b/tests/check/utils/binadded.c
index c30c764..0cddd98 100644
--- a/tests/check/utils/binadded.c
+++ b/tests/check/utils/binadded.c
@@ -272,9 +272,10 @@ GST_START_TEST (test_bin_file)
   g_clear_error (&error);
 
   filename = get_fullpath ("utils/gstelements.conf");
-  fs_element_added_notifier_set_properties_from_file (notifier, filename,
-      &error);
+  fail_unless (fs_element_added_notifier_set_properties_from_file (notifier,
+          filename, &error));
   g_free (filename);
+  fail_if (error != NULL);
 
   fs_element_added_notifier_add (notifier, GST_BIN (pipeline));
 
-- 
1.5.6.5