summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-06-27 10:54:02 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-06-28 09:39:59 +0100
commit79aec9b58cfb15e02a2e028e97f450e18e702a5a (patch)
tree3dbf942e059d5873a85c6059c402e16245e91a5d
parentc2a3fedb7f9574e0050e5c6b9c3fbe7dbcb1bc16 (diff)
downloadlibguestfs-79aec9b58cfb15e02a2e028e97f450e18e702a5a.tar.gz
libguestfs-79aec9b58cfb15e02a2e028e97f450e18e702a5a.tar.xz
libguestfs-79aec9b58cfb15e02a2e028e97f450e18e702a5a.zip
gobject: bindtests: gjs exception behaviour changed, fix test.
When libguestfs calls 'error (g, "error")', gjs in F17 throws error.message == "Error invoking Guestfs.test0rinterr: error" In F18, error.message is simply the string "error". Fix the test so it works for both cases. (cherry picked from commit 6afb7336e33dc28c4fd1a4545a8298ee36c10723)
-rw-r--r--gobject/bindtests-manual.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/gobject/bindtests-manual.js b/gobject/bindtests-manual.js
index 84a1546a..8f4ef152 100644
--- a/gobject/bindtests-manual.js
+++ b/gobject/bindtests-manual.js
@@ -26,7 +26,7 @@ function check_error(f) {
g[f]();
} catch (error) {
threw = true;
- if (!error.message.match(/: error$/)) {
+ if (!error.message.match(/error$/)) {
print(f + " threw unexpected error: " + error.message);
fail = true;
}