Glance

Merge lp:~jshepher/glance/lp739629 into lp:~hudson-openstack/glance/trunk

  1. lp739629
  2. Merge into trunk
Proposed by Justin Shepherd
Status: Merged
Approved by: Jay Pipes
Approved revision: 171
Merged at revision: 171
Proposed branch: lp:~jshepher/glance/lp739629
Merge into: lp:~hudson-openstack/glance/trunk
Diff against target: 31 lines (+3/-0)
2 files modified
run_tests.sh (+2/-0)
tools/pip-requires (+1/-0)
To merge this branch: bzr merge lp:~jshepher/glance/lp739629
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Devin Carlen (community) Approve
Review via email: mp+69875@code.launchpad.net

Description of the change

Added nose-exclude to pip-requires.

'./run_tests.sh --unittests-only' adds '--exclude-dir=tests/functional' to noseargs.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Jay Pipes (jaypipes) wrote :

well played, sir. well played.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run_tests.sh'
2--- run_tests.sh 2011-07-27 21:06:01 +0000
3+++ run_tests.sh 2011-07-30 05:17:23 +0000
4@@ -7,6 +7,7 @@
5 echo " -V, --virtual-env Always use virtualenv. Install automatically if not present"
6 echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment"
7 echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added."
8+ echo " --unittests-only Run unit tests only, exclude functional tests."
9 echo " -p, --pep8 Just run pep8"
10 echo " -h, --help Print this usage message"
11 echo ""
12@@ -23,6 +24,7 @@
13 -N|--no-virtual-env) let always_venv=0; let never_venv=1;;
14 -p|--pep8) let just_pep8=1;;
15 -f|--force) let force=1;;
16+ --unittests-only) noseargs="$noseargs --exclude-dir=tests/functional";;
17 *) noseargs="$noseargs $1"
18 esac
19 }
20
21=== modified file 'tools/pip-requires'
22--- tools/pip-requires 2011-07-29 18:02:03 +0000
23+++ tools/pip-requires 2011-07-30 05:17:23 +0000
24@@ -9,6 +9,7 @@
25 webob==1.0.8
26 wsgiref
27 nose
28+nose-exclude
29 sphinx
30 argparse
31 mox==0.5.0

Subscribers

People subscribed via source and target branches