From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 23 Sep 2009 15:54:48 +0000 (-0400)
Subject: test: Throw a proper error in GetBridgeName
X-Git-Tag: v0.7.2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c4b8a7706484244533052ed9c4da3361ea6bc2e;p=thirdparty%2Flibvirt.git

test: Throw a proper error in GetBridgeName

Throw error in GetBridgeName if net has no bridge.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index f57c92a4e8..30014fc1fc 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2546,8 +2546,14 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) {
         goto cleanup;
     }
 
-    if (privnet->def->bridge &&
-        !(bridge = strdup(privnet->def->bridge))) {
+    if (!(privnet->def->bridge)) {
+        testError(network->conn, VIR_ERR_INTERNAL_ERROR,
+                  _("network '%s' does not have a bridge name."),
+                  privnet->def->name);
+        goto cleanup;
+    }
+
+    if (!(bridge = strdup(privnet->def->bridge))) {
         virReportOOMError(network->conn);
         goto cleanup;
     }