commit 70c44831a5cdf605365a0b60994e2a458907d27f
Author: Matt Riedemann <email address hidden>
Date: Thu Feb 9 18:41:11 2017 -0500
libvirt: fix and break up _test_attach_detach_interface
The detach_interface flow in this test was broken because
it wasn't mocking out domain.detachDeviceFlags so the xml
it was expecting to be passed to that method wasn't actually
being verified. The same thing is broken in test
test_detach_interface_device_with_same_mac_address because
it copies the other broken test code.
This change breaks apart the monster attach/detach test method
and converts the detach_interface portion to mock and fixes
the broken assertion.
test_detach_interface_device_with_same_mac_address is just
fixed, not converted to mock.
Reviewed: https:/ /review. openstack. org/470348 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=70c44831a5c df605365a0b6099 4e2a458907d27f
Committed: https:/
Submitter: Jenkins
Branch: stable/newton
commit 70c44831a5cdf60 5365a0b60994e2a 458907d27f
Author: Matt Riedemann <email address hidden>
Date: Thu Feb 9 18:41:11 2017 -0500
libvirt: fix and break up _test_attach_ detach_ interface
The detach_interface flow in this test was broken because detachDeviceFla gs so the xml detach_ interface_ device_ with_same_ mac_address because
it wasn't mocking out domain.
it was expecting to be passed to that method wasn't actually
being verified. The same thing is broken in test
test_
it copies the other broken test code.
This change breaks apart the monster attach/detach test method
and converts the detach_interface portion to mock and fixes
the broken assertion.
test_ detach_ interface_ device_ with_same_ mac_address is just
fixed, not converted to mock.
Conflicts:
nova/ tests/unit/ virt/libvirt/ test_driver. py
NOTE(mriedem): The conflict is due to change c51994d12ce9c67 74d5f956232f950 not being in Newton.
I5c461a8242
Change-Id: I6d9a975876c565 2ef544c587f65b1 bdd1543848b e475dc9512d4082 8da6fcfe15) 5b1db0d538781ca f0e75b6b0e)
Related-Bug: #1607714
(cherry picked from commit 1ecd71b08d14450
(cherry picked from commit c0820944ea8554f