Updated openstack/openstack
Project: openstack/swift  6b189e8ea91eb905b047ddbbdbc530b9a21dec17
null
Fix test to work with mock 0.8.0

This particular test case used a construct that worked in mock 1.0,
but not in 0.8. Our test-requirements.txt says mock>=0.8.0.

Change-Id: I93ed4b7b5d169572bbed6490cb9b0dd421a3b9e2
Updated openstack/openstack
Project: openstack/neutron  67fa30ff8fb0d8662465336c535a36ad116e4289
null
Catch PortNotFound exception during get_dhcp_port

Close-bug: 1252437

Change-Id: I3a7954b869b4f5b909c806f8e47180e1ba6ba374