Ubuntu Pastebin

Paste from ubuntuone-dev-tools at Wed, 22 Jun 2016 16:30:34 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
diff -Nru ubuntuone-dev-tools-13.10/debian/changelog ubuntuone-dev-tools-13.10/debian/changelog
--- ubuntuone-dev-tools-13.10/debian/changelog	2015-08-20 14:10:54.000000000 +0200
+++ ubuntuone-dev-tools-13.10/debian/changelog	2016-06-22 18:26:12.000000000 +0200
@@ -1,3 +1,10 @@
+ubuntuone-dev-tools (13.10-0ubuntu5) yakkety; urgency=medium
+
+  * d/p/fix-coverage-api-changes.patch:
+    - Fix breaking changes in python-coverage
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 22 Jun 2016 18:25:28 +0200
+
 ubuntuone-dev-tools (13.10-0ubuntu4) wily; urgency=medium
 
   * debian/patches/fix-test-failures.patch:
diff -Nru ubuntuone-dev-tools-13.10/debian/patches/fix-coverage-api-changes.patch ubuntuone-dev-tools-13.10/debian/patches/fix-coverage-api-changes.patch
--- ubuntuone-dev-tools-13.10/debian/patches/fix-coverage-api-changes.patch	1970-01-01 01:00:00.000000000 +0100
+++ ubuntuone-dev-tools-13.10/debian/patches/fix-coverage-api-changes.patch	2016-06-22 18:27:04.000000000 +0200
@@ -0,0 +1,29 @@
+Description: New coverage requires a variable to act on
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+
+--- ubuntuone-dev-tools-13.10.orig/ubuntuone/devtools/runners/__init__.py
++++ ubuntuone-dev-tools-13.10/ubuntuone/devtools/runners/__init__.py
+@@ -277,8 +277,9 @@ def main():
+     suite = test_runner.get_suite(options)
+ 
+     if options['coverage']:
+-        coverage.erase()
+-        coverage.start()
++        cov = coverage.Coverage()
++        cov.erase()
++        cov.start()
+ 
+     running_services = []
+ 
+@@ -297,8 +298,8 @@ def main():
+             service.stop_service()
+ 
+     if options['coverage']:
+-        coverage.stop()
+-        coverage.report(test_runner.source_files, ignore_errors=True,
+-                        show_missing=False)
++        cov.stop()
++        cov.report(test_runner.source_files, ignore_errors=True,
++                   show_missing=False)
+ 
+     sys.exit(not succeeded)
diff -Nru ubuntuone-dev-tools-13.10/debian/patches/series ubuntuone-dev-tools-13.10/debian/patches/series
--- ubuntuone-dev-tools-13.10/debian/patches/series	2015-08-20 14:10:44.000000000 +0200
+++ ubuntuone-dev-tools-13.10/debian/patches/series	2016-06-22 18:27:04.000000000 +0200
@@ -1,3 +1,4 @@
 00_bzr-twisted-regression.patch
 00_bzr-new-pep8.patch
 fix-test-failures.patch
+fix-coverage-api-changes.patch
Download as text