nova-docker test test_unplug_vifs_ovs fails

[Craig Tracey]

Looks like nova has changed upstream, thus breaking our mock call:

Traceback (most recent call last):
  File "novadocker/tests/virt/docker/test_vifs.py", line 215, in test_unplug_vifs_ovs
    ex.assert_has_calls(calls)
  File "/home/ctracey/src/git/craigtracey/nova-docker/.tox/py27/local/lib/python2.7/site-packages/mock.py", line 863, in assert_has_calls
    'Actual: %r' % (calls, self.mock_calls)
AssertionError: Calls not found.
Expected: [call('ovs-vsctl', '--timeout=120', 'del-port', 'br-int', 'tap920be2f4-2b', run_as_root=True)]
Actual: [call('ovs-vsctl', '--timeout=120', '--', '--if-exists', 'del-port', 'br-int', 'tap920be2f4-2b', run_as_root=True)]

Upstream change:
https://github.com/openstack/nova/commit/476dc5efcdb11c9859b062dc69a8c205e69be861

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/96190

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/96190
Committed: https://git.openstack.org/cgit/stackforge/nova-docker/commit/?id=23d33d23f156c7f8e08784330dd26c278fe1d359
Submitter: Jenkins
Branch: master

commit 23d33d23f156c7f8e08784330dd26c278fe1d359
Author: Craig Tracey <email address hidden>
Date: Wed May 28 11:36:29 2014 -0400

    Update test_vifs to ignore ovs errors on del-port

    nova has changed upstream. Now, when calling ovs-vsctl to delete a port
    they explicitly short circuit the deletion if the port does not exist.
    This broke nova-docker's mock call. Fix it so tests pass.

    Reference:
    https://github.com/openstack/nova/commit/476dc5efcdb11c9859b062dc69a8c205e69be861

    Closes-Bug: #1324175
    Change-Id: I920536b27a7e7fd30e7d80148d38f7ef6877c707