← Back to branch summary

~zulcss/horizon/horizon-pbr

« back to all changes in this revision

Viewing changes to debian/patches/fix-ubuntu-tests.patch

  • Committer: Chuck Short
  • Date: 2012-11-21 18:26:32 UTC
  • Revision ID: zulcss@ubuntu.com-20121121182632-bsezzwtki5rla4ch
Refresh fix-ubuntu-tests.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-ubuntu-tests.patch
1
 
--- a/run_tests.sh
2
 
+++ b/run_tests.sh
3
 
@@ -277,25 +277,26 @@ function run_tests {
 
1
diff -Naurp horizon-2013.1.orig/run_tests.sh horizon-2013.1/run_tests.sh
 
2
--- horizon-2013.1.orig/run_tests.sh    2012-11-20 22:59:39.000000000 -0600
 
3
+++ horizon-2013.1/run_tests.sh 2012-11-21 12:25:55.197240133 -0600
 
4
@@ -292,25 +292,25 @@ function run_tests_all {
4
5
   if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
5
6
     export NOSE_HTML_OUT_FILE='horizon_nose_results.html'
6
7
   fi
7
8
-  ${command_wrapper} coverage erase
8
 
-  ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.test.settings $testargs
 
9
-  ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.test.settings $testopts
9
10
+  ${command_wrapper} python-coverage erase
10
 
+  ${command_wrapper} python-coverage run -p $root/manage.py test horizon --settings=horizon.tests.testsettings $testargs
11
 
+
 
11
+  ${command_wrapper} python-coverage run -p $root/manage.py test horizon --settings=horizon.test.settings $testopts
12
12
   # get results of the Horizon tests
13
13
   HORIZON_RESULT=$?
14
14
 
17
17
-  if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
18
18
-    export NOSE_HTML_OUT_FILE='dashboard_nose_results.html'
19
19
-  fi
20
 
-  ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testargs
21
 
-  # get results of the openstack_dashboard tests
 
20
-  ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts
 
21
+  #echo "Running openstack_dashboard tests"
 
22
+  #export NOSE_XUNIT_FILE=openstack_dashboard/nosetests.xml
 
23
+  #if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
 
24
+  #  export NOSE_HTML_OUT_FILE='dashboard_nose_results.html'
 
25
+  #fi
 
26
+  #${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts
 
27
   # get results of the openstack_dashboard tests
22
28
-  DASHBOARD_RESULT=$?
23
 
+#  echo "Running openstack_dashboard tests"
24
 
+#  export NOSE_XUNIT_FILE=openstack_dashboard/nosetests.xml
25
 
+#  if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
26
 
+#    export NOSE_HTML_OUT_FILE='dashboard_nose_results.html'
27
 
+#  fi
28
 
+#  ${command_wrapper} python-coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testargs
29
 
+#  # get results of the openstack_dashboard tests
30
 
+#  DASHBOARD_RESULT=$?
 
29
+  #DASHBOARD_RESULT=$?
31
30
 
32
31
   if [ $with_coverage -eq 1 ]; then
33
32
     echo "Generating coverage reports"