Updated openstack/openstack
Project: openstack/nova  33119f8b61ec9b7aa9c9047d4512ff628ed07de6

Migrate test_glance from mox to mock

A few tests in test_glance.py are still using mox. Update these
remaining tests to use mock, as this is the general direction in
which the project is moving.

Change-Id: I81fc36467b158625f29593c7173542f843244311