summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-08 18:17:43 +0000
committerGerrit Code Review <review@openstack.org>2012-06-08 18:17:43 +0000
commite3911801f6814ebc8aeed1e6b4284fbfb2e74192 (patch)
tree793fcb76a1f41f520e2584b982592f85ea0233d7
parent01ad153b338c9df264e86b8211e82a811ae6332c (diff)
parentad045864508855361c1ada70c2ef6b8aab0ef2b4 (diff)
downloadnova-e3911801f6814ebc8aeed1e6b4284fbfb2e74192.tar.gz
nova-e3911801f6814ebc8aeed1e6b4284fbfb2e74192.tar.xz
nova-e3911801f6814ebc8aeed1e6b4284fbfb2e74192.zip
Merge "Use OSError instead of ProcessExecutionError."
-rw-r--r--nova/tests/rpc/test_zmq.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/rpc/test_zmq.py b/nova/tests/rpc/test_zmq.py
index 27ae4e6fb..aa7032850 100644
--- a/nova/tests/rpc/test_zmq.py
+++ b/nova/tests/rpc/test_zmq.py
@@ -88,7 +88,7 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase):
except zmq.ZMQError:
assert False, _("Could not create ZeroMQ receiver daemon. "
"Socket may already be in use.")
- except exception.ProcessExecutionError:
+ except OSError:
assert False, _("Could not create IPC directory %s") % \
(ipc_dir, )
finally: