Move to using nosetests and tox.

[jcgregorio_google, 2012-09-05 20:25:14]

https://codereview.appspot.com/6490081/diff/1/runtests.sh
File runtests.sh (left):

https://codereview.appspot.com/6490081/diff/1/runtests.sh#oldcode7
runtests.sh:7: FLAGS=--positional_parameters_enforcement=EXCEPTION
Where does this flag get passed into the nose test runner?

[Ali Afshar, 2012-09-05 20:29:17]

It doesn't, it is set explicitly now, so that flag is no longer required.

http://code.google.com/p/google-api-python-client/source/detail?r=7a6d55de8fa...

On 2012/09/05 20:25:14, jcgregorio_google wrote:
> https://codereview.appspot.com/6490081/diff/1/runtests.sh
> File runtests.sh (left):
> 
> https://codereview.appspot.com/6490081/diff/1/runtests.sh#oldcode7
> runtests.sh:7: FLAGS=--positional_parameters_enforcement=EXCEPTION
> Where does this flag get passed into the nose test runner?

[jcgregorio_google, 2012-09-05 20:34:14]

It is set in that code for just one specific test, I would want it set
for everything
when we run unit tests.

On Wed, Sep 5, 2012 at 4:29 PM,  <afshar@google.com> wrote:
> Reviewers: jcgregorio_google,
>
> Message:
> It doesn't, it is set explicitly now, so that flag is no longer
> required.
>
>
http://code.google.com/p/google-api-python-client/source/detail?r=7a6d55de8fa...
>
>
> On 2012/09/05 20:25:14, jcgregorio_google wrote:
>>
>> https://codereview.appspot.com/6490081/diff/1/runtests.sh
>> File runtests.sh (left):
>
>
>> https://codereview.appspot.com/6490081/diff/1/runtests.sh#oldcode7
>> runtests.sh:7: FLAGS=--positional_parameters_enforcement=EXCEPTION
>> Where does this flag get passed into the nose test runner?
>
>
>
>
>
> Please review this at https://codereview.appspot.com/6490081/
>
> Affected files:
>   M .hgignore
>   M Makefile
>   R runtests.py
>   R runtests.sh
>   M tests/test_oauth2client_django_orm.py
>   A tox.ini
>
>
> Index: .hgignore
> ===================================================================
> --- a/.hgignore
> +++ b/.hgignore
> @@ -7,6 +7,7 @@
>  */.git/*
>  */.cache/*
>  .gitignore
> +.tox
>  samples/buzz/*.dat
>  samples/moderator/*.dat
>  htmlcov/*
> Index: Makefile
> ===================================================================
> --- a/Makefile
> +++ b/Makefile
> @@ -4,9 +4,7 @@
>  APP_ENGINE_PATH=../google_appengine
>
>  test:
> -       ./runtests.sh python2.6
> -       ./runtests.sh python2.7
> -
> +       tox
>
>  .PHONY: coverage
>  coverage:
> Index: runtests.py
> ===================================================================
> deleted file mode 100644
> --- a/runtests.py
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -#!/usr/bin/env python
> -import gflags
> -import glob
> -import imp
> -import logging
> -import os
> -import sys
> -import unittest
> -
> -# import oauth2client.util for its gflags.
> -import oauth2client.util
> -
> -from trace import fullmodname
> -
> -logging.basicConfig(level=logging.CRITICAL)
> -
> -FLAGS = gflags.FLAGS
> -
> -APP_ENGINE_PATH='../google_appengine'
> -
> -# Conditional import of cleanup function
> -try:
> -  from tests.utils import cleanup
> -except:
> -  def cleanup():
> -    pass
> -
> -# Ensure current working directory is in path
> -sys.path.insert(0, os.getcwd())
> -sys.path.insert(0, APP_ENGINE_PATH)
> -
> -from google.appengine.dist import use_library
> -use_library('django', '1.2')
> -
> -
> -def main(argv):
> -  argv = FLAGS(argv)
> -  for t in argv[1:]:
> -    module = imp.load_source('test', t)
> -    test = unittest.TestLoader().loadTestsFromModule(module)
> -    result = unittest.TextTestRunner(verbosity=1).run(test)
> -
> -
> -if __name__ == '__main__':
> -  main(sys.argv)
> Index: runtests.sh
> ===================================================================
> deleted file mode 100755
> --- a/runtests.sh
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -#/bin/bash
> -#
> -# Run all the tests.
> -#
> -# The python interpreter to use is passed in on the command line.
> -
> -FLAGS=--positional_parameters_enforcement=EXCEPTION
> -$1 runtests.py $FLAGS tests/test_discovery.py
> -$1 runtests.py $FLAGS tests/test_errors.py
> -$1 runtests.py $FLAGS tests/test_http.py
> -$1 runtests.py $FLAGS tests/test_json_model.py
> -$1 runtests.py $FLAGS tests/test_mocks.py
> -$1 runtests.py $FLAGS tests/test_model.py
> -$1 runtests.py $FLAGS tests/test_oauth2client_clientsecrets.py
> -$1 runtests.py $FLAGS tests/test_oauth2client_django_orm.py
> -$1 runtests.py $FLAGS tests/test_oauth2client_file.py
> -$1 runtests.py $FLAGS tests/test_oauth2client_jwt.py
> -$1 runtests.py $FLAGS tests/test_oauth2client.py
> -$1 runtests.py $FLAGS tests/test_protobuf_model.py
> -$1 runtests.py $FLAGS tests/test_schema.py
> -$1 runtests.py $FLAGS tests/test_oauth2client_appengine.py
> -$1 runtests.py $FLAGS tests/test_oauth2client_keyring.py
> -$1 runtests.py $FLAGS tests/test_oauth2client_gce.py
> -$1 runtests.py $FLAGS tests/test_oauth2client_xsrfutil.py
> Index: tests/test_oauth2client_django_orm.py
> ===================================================================
> --- a/tests/test_oauth2client_django_orm.py
> +++ b/tests/test_oauth2client_django_orm.py
> @@ -29,6 +29,13 @@
>  import sys
>  import unittest
>
> +# Ensure that if app engine is available, we use the correct django from it
> +try:
> +  from google.appengine.dist import use_library
> +  use_library('django', '1.2')
> +except ImportError:
> +  pass
> +
>  from oauth2client.client import Credentials
>  from oauth2client.client import Flow
>
> Index: tox.ini
> ===================================================================
> new file mode 100644
> --- /dev/null
> +++ b/tox.ini
> @@ -0,0 +1,12 @@
> +[tox]
> +envlist = py26,py27
> +
> +[testenv]
> +deps = keyring
> +       mox
> +       pyopenssl
> +       django==1.2
> +       webtest
> +       nose
> +setenv = PYTHONPATH=../google_appengine
> +commands = nosetests
>
>

[Ali Afshar, 2012-09-05 21:03:39]

Yes and no, since all the tests run in the same process, tests running after
test_discovery has been imported would have the flags enabled. I'm still pretty
much against the dependence on command line flags for the unit tests running
correctly.

On 2012/09/05 20:34:14, jcgregorio_google wrote:
> It is set in that code for just one specific test, I would want it set
> for everything
> when we run unit tests.
> 
> On Wed, Sep 5, 2012 at 4:29 PM,  <mailto:afshar@google.com> wrote:
> > Reviewers: jcgregorio_google,
> >
> > Message:
> > It doesn't, it is set explicitly now, so that flag is no longer
> > required.
> >
> >
>
http://code.google.com/p/google-api-python-client/source/detail?r=7a6d55de8fa...
> >
> >
> > On 2012/09/05 20:25:14, jcgregorio_google wrote:
> >>
> >> https://codereview.appspot.com/6490081/diff/1/runtests.sh
> >> File runtests.sh (left):
> >
> >
> >> https://codereview.appspot.com/6490081/diff/1/runtests.sh#oldcode7
> >> runtests.sh:7: FLAGS=--positional_parameters_enforcement=EXCEPTION
> >> Where does this flag get passed into the nose test runner?
> >
> >
> >
> >
> >
> > Please review this at https://codereview.appspot.com/6490081/
> >
> > Affected files:
> >   M .hgignore
> >   M Makefile
> >   R runtests.py
> >   R runtests.sh
> >   M tests/test_oauth2client_django_orm.py
> >   A tox.ini
> >
> >
> > Index: .hgignore
> > ===================================================================
> > --- a/.hgignore
> > +++ b/.hgignore
> > @@ -7,6 +7,7 @@
> >  */.git/*
> >  */.cache/*
> >  .gitignore
> > +.tox
> >  samples/buzz/*.dat
> >  samples/moderator/*.dat
> >  htmlcov/*
> > Index: Makefile
> > ===================================================================
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -4,9 +4,7 @@
> >  APP_ENGINE_PATH=../google_appengine
> >
> >  test:
> > -       ./runtests.sh python2.6
> > -       ./runtests.sh python2.7
> > -
> > +       tox
> >
> >  .PHONY: coverage
> >  coverage:
> > Index: runtests.py
> > ===================================================================
> > deleted file mode 100644
> > --- a/runtests.py
> > +++ /dev/null
> > @@ -1,45 +0,0 @@
> > -#!/usr/bin/env python
> > -import gflags
> > -import glob
> > -import imp
> > -import logging
> > -import os
> > -import sys
> > -import unittest
> > -
> > -# import oauth2client.util for its gflags.
> > -import oauth2client.util
> > -
> > -from trace import fullmodname
> > -
> > -logging.basicConfig(level=logging.CRITICAL)
> > -
> > -FLAGS = gflags.FLAGS
> > -
> > -APP_ENGINE_PATH='../google_appengine'
> > -
> > -# Conditional import of cleanup function
> > -try:
> > -  from tests.utils import cleanup
> > -except:
> > -  def cleanup():
> > -    pass
> > -
> > -# Ensure current working directory is in path
> > -sys.path.insert(0, os.getcwd())
> > -sys.path.insert(0, APP_ENGINE_PATH)
> > -
> > -from google.appengine.dist import use_library
> > -use_library('django', '1.2')
> > -
> > -
> > -def main(argv):
> > -  argv = FLAGS(argv)
> > -  for t in argv[1:]:
> > -    module = imp.load_source('test', t)
> > -    test = unittest.TestLoader().loadTestsFromModule(module)
> > -    result = unittest.TextTestRunner(verbosity=1).run(test)
> > -
> > -
> > -if __name__ == '__main__':
> > -  main(sys.argv)
> > Index: runtests.sh
> > ===================================================================
> > deleted file mode 100755
> > --- a/runtests.sh
> > +++ /dev/null
> > @@ -1,24 +0,0 @@
> > -#/bin/bash
> > -#
> > -# Run all the tests.
> > -#
> > -# The python interpreter to use is passed in on the command line.
> > -
> > -FLAGS=--positional_parameters_enforcement=EXCEPTION
> > -$1 runtests.py $FLAGS tests/test_discovery.py
> > -$1 runtests.py $FLAGS tests/test_errors.py
> > -$1 runtests.py $FLAGS tests/test_http.py
> > -$1 runtests.py $FLAGS tests/test_json_model.py
> > -$1 runtests.py $FLAGS tests/test_mocks.py
> > -$1 runtests.py $FLAGS tests/test_model.py
> > -$1 runtests.py $FLAGS tests/test_oauth2client_clientsecrets.py
> > -$1 runtests.py $FLAGS tests/test_oauth2client_django_orm.py
> > -$1 runtests.py $FLAGS tests/test_oauth2client_file.py
> > -$1 runtests.py $FLAGS tests/test_oauth2client_jwt.py
> > -$1 runtests.py $FLAGS tests/test_oauth2client.py
> > -$1 runtests.py $FLAGS tests/test_protobuf_model.py
> > -$1 runtests.py $FLAGS tests/test_schema.py
> > -$1 runtests.py $FLAGS tests/test_oauth2client_appengine.py
> > -$1 runtests.py $FLAGS tests/test_oauth2client_keyring.py
> > -$1 runtests.py $FLAGS tests/test_oauth2client_gce.py
> > -$1 runtests.py $FLAGS tests/test_oauth2client_xsrfutil.py
> > Index: tests/test_oauth2client_django_orm.py
> > ===================================================================
> > --- a/tests/test_oauth2client_django_orm.py
> > +++ b/tests/test_oauth2client_django_orm.py
> > @@ -29,6 +29,13 @@
> >  import sys
> >  import unittest
> >
> > +# Ensure that if app engine is available, we use the correct django from it
> > +try:
> > +  from google.appengine.dist import use_library
> > +  use_library('django', '1.2')
> > +except ImportError:
> > +  pass
> > +
> >  from oauth2client.client import Credentials
> >  from oauth2client.client import Flow
> >
> > Index: tox.ini
> > ===================================================================
> > new file mode 100644
> > --- /dev/null
> > +++ b/tox.ini
> > @@ -0,0 +1,12 @@
> > +[tox]
> > +envlist = py26,py27
> > +
> > +[testenv]
> > +deps = keyring
> > +       mox
> > +       pyopenssl
> > +       django==1.2
> > +       webtest
> > +       nose
> > +setenv = PYTHONPATH=../google_appengine
> > +commands = nosetests
> >
> >

[Ali Afshar, 2012-09-05 21:16:56]

Done.

On 2012/09/05 21:03:39, Ali Afshar wrote:
> Yes and no, since all the tests run in the same process, tests running after
> test_discovery has been imported would have the flags enabled. I'm still
pretty
> much against the dependence on command line flags for the unit tests running
> correctly.
> 
> On 2012/09/05 20:34:14, jcgregorio_google wrote:
> > It is set in that code for just one specific test, I would want it set
> > for everything
> > when we run unit tests.
> > 
> > On Wed, Sep 5, 2012 at 4:29 PM,  <mailto:afshar@google.com> wrote:
> > > Reviewers: jcgregorio_google,
> > >
> > > Message:
> > > It doesn't, it is set explicitly now, so that flag is no longer
> > > required.
> > >
> > >
> >
>
http://code.google.com/p/google-api-python-client/source/detail?r=7a6d55de8fa...
> > >
> > >
> > > On 2012/09/05 20:25:14, jcgregorio_google wrote:
> > >>
> > >> https://codereview.appspot.com/6490081/diff/1/runtests.sh
> > >> File runtests.sh (left):
> > >
> > >
> > >> https://codereview.appspot.com/6490081/diff/1/runtests.sh#oldcode7
> > >> runtests.sh:7: FLAGS=--positional_parameters_enforcement=EXCEPTION
> > >> Where does this flag get passed into the nose test runner?
> > >
> > >
> > >
> > >
> > >
> > > Please review this at https://codereview.appspot.com/6490081/
> > >
> > > Affected files:
> > >   M .hgignore
> > >   M Makefile
> > >   R runtests.py
> > >   R runtests.sh
> > >   M tests/test_oauth2client_django_orm.py
> > >   A tox.ini
> > >
> > >
> > > Index: .hgignore
> > > ===================================================================
> > > --- a/.hgignore
> > > +++ b/.hgignore
> > > @@ -7,6 +7,7 @@
> > >  */.git/*
> > >  */.cache/*
> > >  .gitignore
> > > +.tox
> > >  samples/buzz/*.dat
> > >  samples/moderator/*.dat
> > >  htmlcov/*
> > > Index: Makefile
> > > ===================================================================
> > > --- a/Makefile
> > > +++ b/Makefile
> > > @@ -4,9 +4,7 @@
> > >  APP_ENGINE_PATH=../google_appengine
> > >
> > >  test:
> > > -       ./runtests.sh python2.6
> > > -       ./runtests.sh python2.7
> > > -
> > > +       tox
> > >
> > >  .PHONY: coverage
> > >  coverage:
> > > Index: runtests.py
> > > ===================================================================
> > > deleted file mode 100644
> > > --- a/runtests.py
> > > +++ /dev/null
> > > @@ -1,45 +0,0 @@
> > > -#!/usr/bin/env python
> > > -import gflags
> > > -import glob
> > > -import imp
> > > -import logging
> > > -import os
> > > -import sys
> > > -import unittest
> > > -
> > > -# import oauth2client.util for its gflags.
> > > -import oauth2client.util
> > > -
> > > -from trace import fullmodname
> > > -
> > > -logging.basicConfig(level=logging.CRITICAL)
> > > -
> > > -FLAGS = gflags.FLAGS
> > > -
> > > -APP_ENGINE_PATH='../google_appengine'
> > > -
> > > -# Conditional import of cleanup function
> > > -try:
> > > -  from tests.utils import cleanup
> > > -except:
> > > -  def cleanup():
> > > -    pass
> > > -
> > > -# Ensure current working directory is in path
> > > -sys.path.insert(0, os.getcwd())
> > > -sys.path.insert(0, APP_ENGINE_PATH)
> > > -
> > > -from google.appengine.dist import use_library
> > > -use_library('django', '1.2')
> > > -
> > > -
> > > -def main(argv):
> > > -  argv = FLAGS(argv)
> > > -  for t in argv[1:]:
> > > -    module = imp.load_source('test', t)
> > > -    test = unittest.TestLoader().loadTestsFromModule(module)
> > > -    result = unittest.TextTestRunner(verbosity=1).run(test)
> > > -
> > > -
> > > -if __name__ == '__main__':
> > > -  main(sys.argv)
> > > Index: runtests.sh
> > > ===================================================================
> > > deleted file mode 100755
> > > --- a/runtests.sh
> > > +++ /dev/null
> > > @@ -1,24 +0,0 @@
> > > -#/bin/bash
> > > -#
> > > -# Run all the tests.
> > > -#
> > > -# The python interpreter to use is passed in on the command line.
> > > -
> > > -FLAGS=--positional_parameters_enforcement=EXCEPTION
> > > -$1 runtests.py $FLAGS tests/test_discovery.py
> > > -$1 runtests.py $FLAGS tests/test_errors.py
> > > -$1 runtests.py $FLAGS tests/test_http.py
> > > -$1 runtests.py $FLAGS tests/test_json_model.py
> > > -$1 runtests.py $FLAGS tests/test_mocks.py
> > > -$1 runtests.py $FLAGS tests/test_model.py
> > > -$1 runtests.py $FLAGS tests/test_oauth2client_clientsecrets.py
> > > -$1 runtests.py $FLAGS tests/test_oauth2client_django_orm.py
> > > -$1 runtests.py $FLAGS tests/test_oauth2client_file.py
> > > -$1 runtests.py $FLAGS tests/test_oauth2client_jwt.py
> > > -$1 runtests.py $FLAGS tests/test_oauth2client.py
> > > -$1 runtests.py $FLAGS tests/test_protobuf_model.py
> > > -$1 runtests.py $FLAGS tests/test_schema.py
> > > -$1 runtests.py $FLAGS tests/test_oauth2client_appengine.py
> > > -$1 runtests.py $FLAGS tests/test_oauth2client_keyring.py
> > > -$1 runtests.py $FLAGS tests/test_oauth2client_gce.py
> > > -$1 runtests.py $FLAGS tests/test_oauth2client_xsrfutil.py
> > > Index: tests/test_oauth2client_django_orm.py
> > > ===================================================================
> > > --- a/tests/test_oauth2client_django_orm.py
> > > +++ b/tests/test_oauth2client_django_orm.py
> > > @@ -29,6 +29,13 @@
> > >  import sys
> > >  import unittest
> > >
> > > +# Ensure that if app engine is available, we use the correct django from
it
> > > +try:
> > > +  from google.appengine.dist import use_library
> > > +  use_library('django', '1.2')
> > > +except ImportError:
> > > +  pass
> > > +
> > >  from oauth2client.client import Credentials
> > >  from oauth2client.client import Flow
> > >
> > > Index: tox.ini
> > > ===================================================================
> > > new file mode 100644
> > > --- /dev/null
> > > +++ b/tox.ini
> > > @@ -0,0 +1,12 @@
> > > +[tox]
> > > +envlist = py26,py27
> > > +
> > > +[testenv]
> > > +deps = keyring
> > > +       mox
> > > +       pyopenssl
> > > +       django==1.2
> > > +       webtest
> > > +       nose
> > > +setenv = PYTHONPATH=../google_appengine
> > > +commands = nosetests
> > >
> > >

[jcgregorio_google, 2012-09-06 11:57:47]

LGTM

[Ali Afshar, 2012-09-06 15:44:14]

On 2012/09/06 11:57:47, jcgregorio_google wrote:
> LGTM

Submitted in:
http://code.google.com/p/google-api-python-client/source/detail?r=fb9200aeeed...