Removed fix-python-m-coverage.patch FINALLY applied upstream !!! :)

Rewritten-From: 9a47028acfe5b5d63b3fd7b366fa46d1b3220f4a

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 19ec6f8694e9714163eb8b05ed8825ed525b3142..bcca8b910c1dec64133cbf2d2bbeff53cec9848e 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -2,6 +2,7 @@ horizon (2014.2~b1-1) experimental; urgency=medium
 
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * Removed fix-python-m-coverage.patch FINALLY applied upstream !!! :)
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 01 Jul 2014 16:06:08 +0800
 

diff --git a/trusty/debian/patches/fix-python-m-coverage.patch b/trusty/debian/patches/fix-python-m-coverage.patch
deleted file mode 100644 (file)
index fb4db50..0000000
--- a/trusty/debian/patches/fix-python-m-coverage.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Use "python -m covergate" instead of just "coverage"
- In Debian, there's no "coverage" command, so we need to apply this.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2014-03-14
-
-Index: horizon/run_tests.sh
-===================================================================
---- horizon.orig/run_tests.sh  2014-04-02 18:21:26.000000000 +0800
-+++ horizon/run_tests.sh       2014-04-02 18:29:17.000000000 +0800
-@@ -319,8 +319,8 @@
-     export NOSE_HTML_OUT_FILE='horizon_nose_results.html'
-   fi
-   if [ $with_coverage -eq 1 ]; then
--    ${command_wrapper} coverage erase
--    coverage_run="coverage run -p"
-+    ${command_wrapper} python -m coverage erase
-+    coverage_run="python -m coverage run -p"
-   fi
-   ${command_wrapper} ${coverage_run} $root/manage.py test horizon --settings=horizon.test.settings $testopts
-   # get results of the Horizon tests
-@@ -337,9 +337,9 @@
- 
-   if [ $with_coverage -eq 1 ]; then
-     echo "Generating coverage reports"
--    ${command_wrapper} coverage combine
--    ${command_wrapper} coverage xml -i --include="horizon/*,openstack_dashboard/*" --omit='/usr*,setup.py,*egg*,.venv/*'
--    ${command_wrapper} coverage html -i --include="horizon/*,openstack_dashboard/*" --omit='/usr*,setup.py,*egg*,.venv/*' -d reports
-+    ${command_wrapper} python -m coverage combine
-+    ${command_wrapper} python -m coverage xml -i --include="horizon/*,openstack_dashboard/*" --omit='/usr*,setup.py,*egg*,.venv/*'
-+    ${command_wrapper} python -m coverage html -i --include="horizon/*,openstack_dashboard/*" --omit='/usr*,setup.py,*egg*,.venv/*' -d reports
-   fi
-   # Remove the leftover coverage files from the -p flag earlier.
-   rm -f .coverage.*

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index a017bfa83efd75d565b1ae5186708e7078ea0c85..e883b0358c2035eff2581538e242ec72baf1c5fe 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,4 +1,3 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
-fix-python-m-coverage.patch