Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Break the unit test suite's reliance on os.environ #10

Merged
merged 2 commits into from
Jun 20, 2017
Merged

Break the unit test suite's reliance on os.environ #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
175314f
Break the unit test suite's reliance on os.environ
mars-f Jun 15, 2017
906bda5
Use local Phabricator URL in test data
mars-f Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/canned_responses/lando_api/revisions.py
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
"image_url": "https://d2kb8dptaglwte.cloudfront.net/file/data/oywgsrq6rtv5rdfbjvdv/PHID-FILE-632bsum6ksnpu77kymbq/alphanumeric_lato-dark_I.png-_5e622c-255%2C255%2C255%2C0.4.png",
"phid": "PHID-USER-imaduemeadmin",
"real_name": "Israel Madueme",
"url": "https://mozphab.dev.mozaws.net/p/imadueme_admin/",
"url": "http://phabricator.test/p/imadueme_admin/",
"username": "imadueme_admin"
},
"date_created": 1495638270,
@@ -20,14 +20,14 @@
"full_name": "rMOZILLACENTRAL mozilla-central",
"phid": "PHID-REPO-mozillacentral",
"short_name": "rMOZILLACENTRAL",
"url": "https://mozphab.dev.mozaws.net/source/mozilla-central/"
"url": "http://phabricator.test/source/mozilla-central/"
},
"status": 1,
"status_name": "Needs Revision",
"title": "My test diff 1",
"summary": "Summary 1",
"test_plan": "Test Plan 1",
"url": "https://mozphab.dev.mozaws.net/D1"
"url": "http://phabricator.test/D1"
}


@@ -36,7 +36,7 @@
"image_url": "https://d2kb8dptaglwte.cloudfront.net/file/data/oywgsrq6rtv5rdfbjvdv/PHID-FILE-632bsum6ksnpu77kymbq/alphanumeric_lato-dark_I.png-_5e622c-255%2C255%2C255%2C0.4.png",
"phid": "PHID-USER-imaduemeadmin",
"real_name": "Israel Madueme",
"url": "https://mozphab.dev.mozaws.net/p/imadueme_admin/",
"url": "http://phabricator.test/p/imadueme_admin/",
"username": "imadueme_admin"
},
"date_created": 1495638280,
@@ -50,14 +50,14 @@
"full_name": "rMOZILLACENTRAL mozilla-central",
"phid": "PHID-REPO-mozillacentral",
"short_name": "rMOZILLACENTRAL",
"url": "https://mozphab.dev.mozaws.net/source/mozilla-central/"
"url": "http://phabricator.test/source/mozilla-central/"
},
"status": 1,
"status_name": "Needs Revision",
"title": "My test diff 2",
"summary": "Summary 2",
"test_plan": "Test Plan 2",
"url": "https://mozphab.dev.mozaws.net/D2"
"url": "http://phabricator.test/D2"
}

CANNED_LANDO_REVISION_NOT_FOUND = {
2 changes: 1 addition & 1 deletion tests/canned_responses/phabricator/repos.py
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"result": {
"PHID-REPO-mozillacentral": {
"phid": "PHID-REPO-mozillacentral",
"uri": "https://mozphab.dev.mozaws.net/source/mozilla-central/",
"uri": "http://phabricator.test/source/mozilla-central/",
"typeName": "Repository",
"type": "REPO",
"name": "rMOZILLACENTRAL",
4 changes: 2 additions & 2 deletions tests/canned_responses/phabricator/revisions.py
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
"id": "1",
"phid": "PHID-DREV-1",
"title": "My test diff 1",
"uri": "https://mozphab.dev.mozaws.net/D1",
"uri": "http://phabricator.test/D1",
"dateCreated": "1495638270",
"dateModified": "1496239141",
"authorPHID": "PHID-USER-imaduemeadmin",
@@ -47,7 +47,7 @@
"id": "2",
"phid": "PHID-DREV-2",
"title": "My test diff 2",
"uri": "https://mozphab.dev.mozaws.net/D2",
"uri": "http://phabricator.test/D2",
"dateCreated": "1495638280",
"dateModified": "1496239151",
"authorPHID": "PHID-USER-imaduemeadmin",
6 changes: 3 additions & 3 deletions tests/canned_responses/phabricator/users.py
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
"userName": "imadueme_admin",
"realName": "Israel Madueme",
"image": "https://d2kb8dptaglwte.cloudfront.net/file/data/oywgsrq6rtv5rdfbjvdv/PHID-FILE-632bsum6ksnpu77kymbq/alphanumeric_lato-dark_I.png-_5e622c-255%2C255%2C255%2C0.4.png",
"uri": "https://mozphab.dev.mozaws.net/p/imadueme_admin/",
"uri": "http://phabricator.test/p/imadueme_admin/",
"roles": [
"admin",
"verified",
@@ -29,7 +29,7 @@
"userName": "imadueme_admin",
"realName": "Israel Madueme",
"image": "https://d2kb8dptaglwte.cloudfront.net/file/data/oywgsrq6rtv5rdfbjvdv/PHID-FILE-632bsum6ksnpu77kymbq/alphanumeric_lato-dark_I.png-_5e622c-255%2C255%2C255%2C0.4.png",
"uri": "https://mozphab.dev.mozaws.net/p/imadueme_admin/",
"uri": "http://phabricator.test/p/imadueme_admin/",
"roles": [
"admin",
"verified",
@@ -40,4 +40,4 @@
},
"error_code": None,
"error_info": None
}
}
12 changes: 12 additions & 0 deletions tests/conftest.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import pytest


@pytest.fixture
def docker_env_vars(monkeypatch):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a file tests/utils.py which contains utility and setup functions that every test uses. Can you move this function to that file? Unless there is a purpose for this file in the near future. I just want to avoid having a bunch of test setup across different files.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind! I see that conftest.py is a common pattern with pytest.

"""Monkeypatch environment variables that we'd get running under docker."""
monkeypatch.setenv('PHABRICATOR_URL', 'http://phabricator.test')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're going to change the phab url, can you also go through and update all the canned responses to use this URL? Right now they use the default mozphab.aws URL which came from the original docker-compose.yml.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

monkeypatch.setenv('TRANSPLANT_URL', 'http://autoland.test')
2 changes: 2 additions & 0 deletions tests/test_phabricator_client.py
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,8 @@
from tests.canned_responses.phabricator.repos import *
from tests.canned_responses.phabricator.errors import *

pytestmark = pytest.mark.usefixtures('docker_env_vars')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that if you also move this to test/utils.py then we won't have to add it at the top of every test file, every test file can just import the utils file as they already do.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignore the specifics above, but, otherwise is there a better way to have this be done automatically for every test?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Importing the fixture won't apply it - you need to include a fixture in the module's pytestmark to apply it to every test in a file.



def test_get_revision_with_200_response():
phab = PhabricatorClient(api_key='api-key')
2 changes: 2 additions & 0 deletions tests/test_revisions.py
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@
from tests.canned_responses.phabricator.repos import *
from tests.canned_responses.lando_api.revisions import *

pytestmark = pytest.mark.usefixtures('docker_env_vars')


def test_get_revision_with_no_parents(client):
with requests_mock.mock() as m: