From 8748f8e77ab50663c2bf3b98cc4c5a4177c171dc Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 28 Jan 2013 23:19:40 +0800 Subject: [PATCH] Removes failed patches. Rewritten-From: 3a260b0b7643959e70638c2e91cb8ee558ad2763 --- ...or-td.actions_column-of-floating-ips.patch | 17 ------ xenial/debian/patches/fix-quota-summary.patch | 26 -------- xenial/debian/patches/fix-ubuntu-tests.patch | 59 ------------------- xenial/debian/patches/series | 3 - 4 files changed, 105 deletions(-) delete mode 100644 xenial/debian/patches/adds-static-width-for-td.actions_column-of-floating-ips.patch delete mode 100644 xenial/debian/patches/fix-quota-summary.patch delete mode 100644 xenial/debian/patches/fix-ubuntu-tests.patch diff --git a/xenial/debian/patches/adds-static-width-for-td.actions_column-of-floating-ips.patch b/xenial/debian/patches/adds-static-width-for-td.actions_column-of-floating-ips.patch deleted file mode 100644 index 1b756e8..0000000 --- a/xenial/debian/patches/adds-static-width-for-td.actions_column-of-floating-ips.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Adds static width for the #floating-ips td.actions -Author: Jiang Yong -Origin: upstream, https://review.openstack.org/#/c/17530/ -Bug-Ubuntu: https://launchpad.net/bugs/1081875 - ---- horizon-2012.2.1.orig/openstack_dashboard/static/dashboard/less/horizon.less -+++ horizon-2012.2.1/openstack_dashboard/static/dashboard/less/horizon.less -@@ -823,6 +823,9 @@ td.actions_column { - min-width: 140px; - min-height: 20px; - } -+#floating_ips td.actions_column { -+ width: 180px; -+} - - td.actions_column .row_actions a, - td.actions_column .row_actions input, diff --git a/xenial/debian/patches/fix-quota-summary.patch b/xenial/debian/patches/fix-quota-summary.patch deleted file mode 100644 index eaf3c9a..0000000 --- a/xenial/debian/patches/fix-quota-summary.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Fixes: Can not display usage data for Quota Summary. -Author: Kylin CG -Origin: upstream, https://review.openstack.org/#/c/17030/ -Bug-Ubuntu: https://launchpad.net/bugs/1055929 - ---- horizon-2012.2.1.orig/horizon/templates/horizon/common/_quota_summary.html -+++ horizon-2012.2.1/horizon/templates/horizon/common/_quota_summary.html -@@ -2,12 +2,12 @@ - -
-

{% trans "Quota Summary" %}

-- {% trans "Used" %} {{ usage.quota.instances.used|intcomma }} {% trans "of" %} {{ usage.quota.instances.quota|intcomma }} {% trans "Available Instances" %} -- {% horizon_progress_bar usage.quota.instances.used usage.quota.instances.quota %} -+ {% trans "Used" %} {{ usage.quotas.instances.used|intcomma }} {% trans "of" %} {{ usage.quotas.instances.quota|intcomma }} {% trans "Available Instances" %} -+ {% horizon_progress_bar usage.quotas.instances.used usage.quotas.instances.quota %} - -- {% trans "Used" %} {{ usage.quota.cores.used|intcomma }} {% trans "of" %} {{ usage.quota.cores.quota|intcomma }} {% trans "Available vCPUs" %} -- {% horizon_progress_bar usage.quota.cores.used usage.quota.cores.quota %} -+ {% trans "Used" %} {{ usage.quotas.cores.used|intcomma }} {% trans "of" %} {{ usage.quotas.cores.quota|intcomma }} {% trans "Available vCPUs" %} -+ {% horizon_progress_bar usage.quotas.cores.used usage.quotas.cores.quota %} - -- {% trans "Used" %} {{ usage.quota.ram.used|intcomma }} MB {% trans "of" %} {{ usage.quota.ram.quota|intcomma }} MB {% trans "Available RAM" %} -- {% horizon_progress_bar usage.quota.ram.used usage.quota.ram.quota %} -+ {% trans "Used" %} {{ usage.quotas.ram.used|intcomma }} MB {% trans "of" %} {{ usage.quotas.ram.quota|intcomma }} MB {% trans "Available RAM" %} -+ {% horizon_progress_bar usage.quotas.ram.used usage.quotas.ram.quota %} -
diff --git a/xenial/debian/patches/fix-ubuntu-tests.patch b/xenial/debian/patches/fix-ubuntu-tests.patch deleted file mode 100644 index 3505b80..0000000 --- a/xenial/debian/patches/fix-ubuntu-tests.patch +++ /dev/null @@ -1,59 +0,0 @@ -Description: Fixes some unit testings -Author: Mehdi Abaakouk -Forwarded: not-needed - -Index: horizon-2012.2/run_tests.sh -=================================================================== ---- horizon-2012.2.orig/run_tests.sh 2012-08-23 18:52:34.891973319 -0700 -+++ horizon-2012.2/run_tests.sh 2012-08-23 18:53:15.879971813 -0700 -@@ -274,25 +274,25 @@ - if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then - export NOSE_HTML_OUT_FILE='horizon_nose_results.html' - fi -- ${command_wrapper} coverage erase -- ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.tests.testsettings $testargs -+ ${command_wrapper} python-coverage erase -+ ${command_wrapper} python-coverage run -p $root/manage.py test horizon --settings=horizon.tests.testsettings $testargs - # get results of the Horizon tests - HORIZON_RESULT=$? - -- echo "Running openstack_dashboard tests" -- export NOSE_XUNIT_FILE=openstack_dashboard/nosetests.xml -- if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then -- export NOSE_HTML_OUT_FILE='dashboard_nose_results.html' -- fi -- ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testargs -- # get results of the openstack_dashboard tests -- DASHBOARD_RESULT=$? -+# echo "Running openstack_dashboard tests" -+# export NOSE_XUNIT_FILE=openstack_dashboard/nosetests.xml -+# if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then -+# export NOSE_HTML_OUT_FILE='dashboard_nose_results.html' -+# fi -+# ${command_wrapper} python-coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testargs -+# # get results of the openstack_dashboard tests -+# DASHBOARD_RESULT=$? - - if [ $with_coverage -eq 1 ]; then - echo "Generating coverage reports" -- ${command_wrapper} coverage combine -- ${command_wrapper} coverage xml -i --omit='/usr*,setup.py,*egg*,.venv/*' -- ${command_wrapper} coverage html -i --omit='/usr*,setup.py,*egg*,.venv/*' -d reports -+ ${command_wrapper} python-coverage combine -+ ${command_wrapper} python-coverage xml -i --omit='/usr*,setup.py,*egg*,.venv/*' -+ ${command_wrapper} python-coverage html -i --omit='/usr*,setup.py,*egg*,.venv/*' -d reports - fi - # Remove the leftover coverage files from the -p flag earlier. - rm -f .coverage.* -Index: horizon-2012.2/horizon/tests/testsettings.py -=================================================================== ---- horizon-2012.2.orig/horizon/tests/testsettings.py 2012-08-23 18:52:34.647973328 -0700 -+++ horizon-2012.2/horizon/tests/testsettings.py 2012-08-23 18:54:36.615968847 -0700 -@@ -98,7 +98,6 @@ - TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' - NOSE_ARGS = ['--nocapture', - '--nologcapture', -- '--exclude-dir=horizon/conf/', - '--cover-package=horizon', - '--cover-inclusive'] - diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series index 9ebdfc2..a9d37ec 100644 --- a/xenial/debian/patches/series +++ b/xenial/debian/patches/series @@ -1,6 +1,3 @@ fix-dashboard-django-wsgi.patch fix-dashboard-manage.patch -fix-ubuntu-tests.patch debian_local_settings.patch -fix-quota-summary.patch -adds-static-width-for-td.actions_column-of-floating-ips.patch -- 2.45.2