← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ceilometer/vivid

« back to all changes in this revision

Viewing changes to debian/patches/skip-gabbi.patch

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-02-19 14:59:07 UTC
  • mfrom: (1.2.3)
  • Revision ID: package-import@ubuntu.com-20150219145907-9jojybdsl64zcn14
Tags: 2015.1~b2-0ubuntu1
[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/p/skip-test.patch: Rebased.

[ James Page ]
* d/rules,d/p/skip-gabbi.patch: Skip tests that rely on python-gabbi until
  packaging and MIR is complete.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/skip-gabbi.patch
 
1
--- a/ceilometer/tests/gabbi/test_gabbi.py
 
2
+++ b/ceilometer/tests/gabbi/test_gabbi.py
 
3
@@ -20,10 +20,14 @@ For the sake of exploratory development.
 
4
 
 
5
 import os
 
6
 
 
7
-from gabbi import driver
 
8
+try:
 
9
+    from gabbi import driver
 
10
+except ImportError:
 
11
+    driver = None
 
12
 
 
13
 from ceilometer.api import app
 
14
-from ceilometer.tests.gabbi import fixtures as fixture_module
 
15
+if driver:
 
16
+    from ceilometer.tests.gabbi import fixtures as fixture_module
 
17
 
 
18
 
 
19
 TESTS_DIR = 'gabbits'