X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fpatches%2Fskip-test.patch;fp=trusty%2Fdebian%2Fpatches%2Fskip-test.patch;h=0000000000000000000000000000000000000000;hb=378bac3ef6a5faf59b1722d186df3db8c01c13d3;hp=1e69a66ce71106dbf4736635ee3f49bd79762222;hpb=981587dac7b7711ee52a4fc6b8589ad23db4c59b;p=openstack-build%2Fceilometer-build.git diff --git a/trusty/debian/patches/skip-test.patch b/trusty/debian/patches/skip-test.patch deleted file mode 100644 index 1e69a66..0000000 --- a/trusty/debian/patches/skip-test.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/ceilometer/tests/api/v2/test_event_scenarios.py -+++ b/ceilometer/tests/api/v2/test_event_scenarios.py -@@ -138,7 +138,10 @@ - # We expect to get native UTC generated time back - trait_time = self.s_time - for event in data: -- expected_generated = trait_time.isoformat() -+ try: -+ expected_generated = trait_time.isoformat() -+ except: -+ self.skipTest('Skipped by Ubuntu') - self.assertIn(event['event_type'], ['Foo', 'Bar', 'Zoo']) - self.assertEqual(4, len(event['traits'])) - self.assertEqual({'status': {'nested': 'started'}}, event['raw']),