Migrate test runner to py.test #569

pferate · 2016-07-26T17:15:13Z

Maintainer of pytest_gae needs to merge open PR and push to PyPI.
In the mean time, get code directly from GitHub mirror.

theacodes · 2016-07-26T17:25:46Z

We can probably just rip off the App Engine stuff from here into a conftest.py for the appengine things.

(it's not a lot of code)

oauth2client/crypt.py

+    define these on set up.
+    """
+    global Signer
+    global Verifier


pferate · 2016-07-26T22:21:07Z

@jonparrott Should we worry about populating the conftest.py file now? Or should we wait until we start moving everything to fixtures (phase 3)?

pferate · 2016-07-27T16:03:34Z

There is a bug in the 0.9 release of flake8-import-order (released yesterday) that is causing the flake8 test to incorrectly fail.

I've already created an issue for it.

theacodes · 2016-07-27T16:50:06Z

@pferate if we need app engine stuff to work (which we do) we might as well populate conftest.py just for that. You only need a subset of the stuff in the example I linked.

pferate · 2016-07-27T17:36:42Z

I copied the code from App Engine file you linked. I moved the imports within setup_sdk_imports to within try/except blocks, so that the tests don't fail outside of App Engine.

I just added the fixture code for this PR to pytest_configure().

These will be expanded more when we transition the tests here to fixtures.

tests/conftest.py

+        pass
+
+
+def import_appengine_config():


theacodes · 2016-07-27T22:44:50Z

Please don't merge this until after the 3.0.0 release. I'll remove the label when it's safe.

theacodes · 2016-07-28T19:32:53Z

v3.0.0 is released so this can now be considered for merging.

pferate · 2016-07-28T19:38:44Z

Should there be a 4.x or Dev branch, so that they can be kept separate from 3.x updates?

theacodes · 2016-07-28T19:43:10Z

Should there be a 4.x or Dev branch, so that they can be kept separate from 3.x updates?

I don't think so, but @nathanielmanistaatgoogle is welcome to overrule that.

tests/conftest.py

+
+    # Fixes timezone and other os-level items.
+    import google.appengine.tools.os_compat
+    (google.appengine.tools.os_compat)


pferate · 2016-08-08T22:35:55Z

Rebased onto master.

Thanks for the help @jonparrott!

tests/contrib/appengine/conftest.py

+    Return True to skip collection. Skips App Engine tests when --gae-sdk
+    is not specified.
+    """
+    if 'contrib/appengine' in str(path):


nathanielmanistaatgoogle · 2016-08-09T15:22:17Z

Looks mostly good; just that one comment.

pferate · 2016-08-09T16:04:58Z

@jonparrott, with us moving the app engine tests into their own directory, should we move the app engine modules into their own directory as well?

Another coupled set of files are contrib/gce and contrib/_metadata.

theacodes · 2016-08-09T16:22:49Z

with us moving the app engine tests into their own directory, should we move the app engine modules into their own directory as well?

I don't think so. There's no hard and fast rule that tests must be organized exactly as their module-under-test. I think defaulting to that but making exceptions where it makes testing easier (like we did here) makes sense. Practicality beats purity.

tests/contrib/appengine/conftest.py

+        set_up_gae_environment(config.getoption('gae_sdk'))
+
+
+def pytest_ignore_collect(path, config):


pferate · 2016-08-09T16:55:51Z

@nathanielmanistaatgoogle: PR updated, PTAL.

tests/contrib/appengine/conftest.py

+
+def pytest_ignore_collect(path, config):
+    """Direct py.test to skip App Engine tests when --gae-sdk is not specified.
+


nathanielmanistaatgoogle · 2016-08-09T16:58:51Z

One last tweak; sorry.

pferate · 2016-08-09T17:54:22Z

PR updated. @nathanielmanistaatgoogle PTAL.

nathanielmanistaatgoogle · 2016-08-09T19:34:31Z

What's with that test failure?

Is it desired that this go in as two commits? (No pushing in either direction; just want to confirm.)

pferate · 2016-08-09T19:44:57Z

Looks like it may be related to #590. This is what is in my Travis logs:

# Travis ships with an old version of PyPy, so install at least version 2.6.
if [[ "${TOX_ENV}" == "pypy" ]]; then
    git clone https://github.com/yyuu/pyenv.git ${HOME}/.pyenv
    ${HOME}/.pyenv/bin/pyenv install pypy-2.6.0
fi
fatal: destination path '/home/travis/.pyenv' already exists and is not an empty directory.

In my repo, pypy passed the first time, but failed when I reran the test.

As for the commits, one was a merged PR from @jonparrott helping me sort out some of the GAE tests, so I didn't want to lose his work within mine. Functionally, they could be squashed.

theacodes · 2016-08-09T19:48:41Z

The pypy failure is my fault. We probably just need to check for the non-existence of {$HOME}/.pyenv before doing the git clone.

We can do it in this PR or I can send a separate one.

nathanielmanistaatgoogle · 2016-08-09T19:50:36Z

Separate pull request with the fix in isolation, please.

theacodes · 2016-08-09T21:14:40Z

@pferate It's fixed, rebase and try again?

Migrating test runner from `unittest2`/`nose` to `pytest`. The pytest runner is also compatible with both unittest and nose tests. Some of the benefits of PyTest include: * using plain asserts * function-based fixtures instead of setUp and tearDown * no strange camelCase methods

pferate · 2016-08-09T22:03:36Z

@jonparrott Rebased and waiting on Travis.

One weird thing that I've been seeing recently is py33 tests have been failing in my fork on Travis, but have been passing on the main repo. They also pass when I run them on my local system.

The 2 linked Travis jobs are from the same commit from yesterday. It looks like my fork is collecting the django tests (it shouldn't) and the main repo correctly skips them. Before I dig much further, do you have any idea of what's going on?

As long as it passes on the main repo, it doesn't really matter; but this seems strange.

nathanielmanistaatgoogle · 2016-08-09T23:08:24Z

@pferate: are you waiting for answers from @jonparrott before this gets merged?

(I am completely fine with the pull request content and metadata; feel free to merge when conversation is again concluded.)

pferate · 2016-08-09T23:27:43Z

No need to wait. I just had some weird, unique test results that I'm trying to figure out on my end.

googlebot added the cla: yes label Jul 26, 2016

dhermes reviewed Jul 26, 2016
View reviewed changes

oauth2client/crypt.py

define these on set up.

"""

global Signer

global Verifier

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

pferate force-pushed the pytest_runner branch 5 times, most recently from 2e5b8cb to 16ce742 Compare July 27, 2016 15:53

pferate force-pushed the pytest_runner branch from 16ce742 to 3482d96 Compare July 27, 2016 17:31

theacodes reviewed Jul 27, 2016
View reviewed changes

tests/conftest.py

pass

def import_appengine_config():

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

pferate force-pushed the pytest_runner branch from 3482d96 to dba1856 Compare July 27, 2016 21:58

theacodes added the don't merge label Jul 27, 2016

theacodes added this to the 4.0.0 milestone Jul 27, 2016

theacodes removed the don't merge label Jul 28, 2016

theacodes assigned nathanielmanistaatgoogle Jul 28, 2016

nathanielmanistaatgoogle reviewed Jul 29, 2016
View reviewed changes

nathanielmanistaatgoogle reviewed Aug 9, 2016
View reviewed changes

tests/contrib/appengine/conftest.py

set_up_gae_environment(config.getoption('gae_sdk'))

def pytest_ignore_collect(path, config):

This comment was marked as spam.

Sign in to view

pferate force-pushed the pytest_runner branch from 454d553 to 76185d1 Compare August 9, 2016 16:51

nathanielmanistaatgoogle reviewed Aug 9, 2016
View reviewed changes

tests/contrib/appengine/conftest.py

def pytest_ignore_collect(path, config):

"""Direct py.test to skip App Engine tests when --gae-sdk is not specified.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

pferate force-pushed the pytest_runner branch from 76185d1 to b394181 Compare August 9, 2016 17:39

pferate force-pushed the pytest_runner branch from b394181 to 32b004e Compare August 9, 2016 19:02

pferate force-pushed the pytest_runner branch 3 times, most recently from fe201ff to e80dd38 Compare August 9, 2016 21:36

Re-configure App engine tests

4cac96d

pferate force-pushed the pytest_runner branch from e80dd38 to 4cac96d Compare August 9, 2016 21:41

nathanielmanistaatgoogle merged commit f774a66 into googleapis:master Aug 10, 2016

pferate deleted the pytest_runner branch August 10, 2016 17:55

google-admin unassigned nathanielmanistaatgoogle Sep 11, 2018

		set_up_gae_environment(config.getoption('gae_sdk'))


		def pytest_ignore_collect(path, config):


		def pytest_ignore_collect(path, config):
		"""Direct py.test to skip App Engine tests when --gae-sdk is not specified.

Migrate test runner to py.test #569

Migrate test runner to py.test #569

Conversation

pferate commented Jul 26, 2016

theacodes commented Jul 26, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

pferate commented Jul 26, 2016

pferate commented Jul 27, 2016

theacodes commented Jul 27, 2016

pferate commented Jul 27, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

theacodes commented Jul 27, 2016

theacodes commented Jul 28, 2016 • edited Loading

pferate commented Jul 28, 2016

theacodes commented Jul 28, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

pferate commented Aug 8, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

nathanielmanistaatgoogle commented Aug 9, 2016

pferate commented Aug 9, 2016

theacodes commented Aug 9, 2016

This comment was marked as spam.

pferate commented Aug 9, 2016

This comment was marked as spam.

This comment was marked as spam.

nathanielmanistaatgoogle commented Aug 9, 2016

pferate commented Aug 9, 2016

nathanielmanistaatgoogle commented Aug 9, 2016

pferate commented Aug 9, 2016

theacodes commented Aug 9, 2016

nathanielmanistaatgoogle commented Aug 9, 2016

theacodes commented Aug 9, 2016

pferate commented Aug 9, 2016

nathanielmanistaatgoogle commented Aug 9, 2016

pferate commented Aug 9, 2016

theacodes commented Jul 28, 2016 •

edited

Loading