fix alarm notifier tests
fix alarm notifier tests

When I was adding a field to the notification I noticed that
the change was not getting caught. This changes the mocking to
only use mock instead of a combination of mox and mock.

Change-Id: I507388b38728f6bd5417817e70890c1e966912c4

JioCloud/ceilometer,Juniper/ceilometer,sileht/aodh,isyippee/ceilometer,pczerkas/aodh,JioCloud/ceilometer,mathslinux/ceilometer,eayunstack/ceilometer,fabian4/ceilometer,JioCloud/ceilometer,MisterPup/Ceilometer-Juno-Extension,rickerc/ceilometer_audit,redhat-openstack/ceilometer,pkilambi/ceilometer,froyobin/ceilometer,chungg/aodh,redhat-openstack/ceilometer,luogangyi/Ceilometer-oVirt,ityaptin/ceilometer,openstack/ceilometer,sileht/aodh,maestro-hybrid-cloud/ceilometer,openstack/aodh,rackerlabs/instrumented-ceilometer,m1093782566/openstack_org_ceilometer,rickerc/ceilometer_audit,idegtiarov/ceilometer,rackerlabs/instrumented-ceilometer,luogangyi/Ceilometer-oVirt,rickerc/ceilometer_audit,NeCTAR-RC/ceilometer,maestro-hybrid-cloud/ceilometer,ityaptin/ceilometer,tanglei528/ceilometer,fabian4/ceilometer,pkilambi/ceilometer,citrix-openstack-build/ceilometer,eayunstack/ceilometer,r-mibu/ceilometer,NeCTAR-RC/ceilometer,isyippee/ceilometer,rackerlabs/instrumented-ceilometer,r-mibu/ceilometer,pczerkas/aodh,mathslinux/ceilometer,m1093782566/openstack_org_ceilometer,cernops/ceilometer,Juniper/ceilometer,openstack/aodh,froyobin/ceilometer,MisterPup/Ceilometer-Juno-Extension,tanglei528/ceilometer,idegtiarov/ceilometer,chungg/aodh,cernops/ceilometer,NeCTAR-RC/ceilometer,citrix-openstack-build/ceilometer,tanglei528/ceilometer,openstack/ceilometer,citrix-openstack-build/ceilometer