Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Build and test on Windows

on:
pull_request:
branches:
- main

jobs:
test:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
with:
persist-credentials: false
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
# This probably will not work on Windows, but worth a try.
python -m pip install -r requirements/requirements-3.10-Windows.txt
python -m pip install -e .
- name: Run tests
run: |
python -m pytest -vvv
533 changes: 533 additions & 0 deletions requirements/requirements-3.10-Linux.txt

Large diffs are not rendered by default.

440 changes: 440 additions & 0 deletions requirements/requirements-3.10-Windows.txt

Large diffs are not rendered by default.

425 changes: 425 additions & 0 deletions requirements/requirements-3.10-macOS.txt

Large diffs are not rendered by default.

576 changes: 576 additions & 0 deletions requirements/requirements-3.7-Linux.txt

Large diffs are not rendered by default.

483 changes: 483 additions & 0 deletions requirements/requirements-3.7-Windows.txt

Large diffs are not rendered by default.

468 changes: 468 additions & 0 deletions requirements/requirements-3.7-macOS.txt

Large diffs are not rendered by default.

541 changes: 541 additions & 0 deletions requirements/requirements-3.8-Linux.txt

Large diffs are not rendered by default.

448 changes: 448 additions & 0 deletions requirements/requirements-3.8-Windows.txt

Large diffs are not rendered by default.

433 changes: 433 additions & 0 deletions requirements/requirements-3.8-macOS.txt

Large diffs are not rendered by default.

539 changes: 539 additions & 0 deletions requirements/requirements-3.9-Linux.txt

Large diffs are not rendered by default.

446 changes: 446 additions & 0 deletions requirements/requirements-3.9-Windows.txt

Large diffs are not rendered by default.

431 changes: 431 additions & 0 deletions requirements/requirements-3.9-macOS.txt

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def repo(tmp_path, config):
file_config = FileConfig(test_repo / "mots.yml")
file_config.config = config
hashes = {
"config": "6ef5f3ed90c5d9aa2eec7b91ed65a78b886e8fa1",
"config": "95019b9669241e19148ddd4f57f1700d397997a4",
"export": "da39a3ee5e6b4b0d3255bfef95601890afd80709",
}
file_config.write(hashes)
Expand All @@ -62,9 +62,9 @@ def repo(tmp_path, config):
@pytest.fixture
def config():
people = [
{"name": "jane", "nick": "jane", "bmo_id": 0},
{"name": "jill", "nick": "jill", "bmo_id": 1},
{"name": "otis", "nick": "otis", "bmo_id": 2},
{"name": "Jane François", "nick": "jane", "bmo_id": 0},
{"name": "Jill O'Sullivan", "nick": "jill", "bmo_id": 1},
{"name": "Otis Morris-West", "nick": "otis", "bmo_id": 2},
]
return {
"repo": "test_repo",
Expand Down
4 changes: 2 additions & 2 deletions tests/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def test_calculate_hashes(config):
export = b""
hashes = calculate_hashes(config, export)[1]

assert hashes["config"] == "6ef5f3ed90c5d9aa2eec7b91ed65a78b886e8fa1"
assert hashes["config"] == "95019b9669241e19148ddd4f57f1700d397997a4"
assert hashes["export"] == "da39a3ee5e6b4b0d3255bfef95601890afd80709"


Expand All @@ -26,7 +26,7 @@ def test_FileConfig__check_hashes(repo):
errors = file_config.check_hashes()
assert errors == [
"Mismatch in config hash detected.",
"6ef5f3ed90c5d9aa2eec7b91ed65a78b886e8fa1 does not match asdf",
"95019b9669241e19148ddd4f57f1700d397997a4 does not match asdf",
"config file is out of date.",
"Mismatch in export hash detected.",
"da39a3ee5e6b4b0d3255bfef95601890afd80709 does not match ghjk",
Expand Down
18 changes: 12 additions & 6 deletions tests/test_directory.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@ def test_directory__Directory__query(repo):
"birds/parrot",
"felines/persian",
}
assert set(result.owners) == {Person(bmo_id=2, name="otis", nick="otis")}
assert set(result.peers) == {Person(bmo_id=1, name="jill", nick="jill")}
assert set(result.owners) == {
Person(bmo_id=2, name="Otis Morris-West", nick="otis")
}
assert set(result.peers) == {Person(bmo_id=1, name="Jill O'Sullivan", nick="jill")}
assert result.rejected_paths == ["felines/maine_coon"]


Expand Down Expand Up @@ -136,8 +138,10 @@ def test_directory__Directory__query_merging(repo):
"birds/parrot",
"felines/persian",
}
assert set(result.owners) == {Person(bmo_id=2, name="otis", nick="otis")}
assert set(result.peers) == {Person(bmo_id=1, name="jill", nick="jill")}
assert set(result.owners) == {
Person(bmo_id=2, name="Otis Morris-West", nick="otis")
}
assert set(result.peers) == {Person(bmo_id=1, name="Jill O'Sullivan", nick="jill")}
assert result.rejected_paths == ["felines/maine_coon"]


Expand All @@ -164,8 +168,10 @@ def test_directory__Directory__query_add_to_empty_QueryResult(repo):
"canines/chihuahuas/apple_head",
"birds/parrot",
}
assert set(result.owners) == {Person(bmo_id=2, name="otis", nick="otis")}
assert set(result.peers) == {Person(bmo_id=1, name="jill", nick="jill")}
assert set(result.owners) == {
Person(bmo_id=2, name="Otis Morris-West", nick="otis")
}
assert set(result.peers) == {Person(bmo_id=1, name="Jill O'Sullivan", nick="jill")}
assert result.rejected_paths == ["felines/maine_coon"]


Expand Down
9 changes: 5 additions & 4 deletions tests/test_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ def test_export_format_people_for_rst(config):
"""Ensure outputted strings are correct when formatting people."""
config["people"].append({"nick": "unnamed"})
test = format_people_for_rst(config["people"], indent=8)
base_url = "https://people.mozilla.org/s?query="
assert test == (
"\n | `jane (jane) <https://people.mozilla.org/s?query=jane>`__"
"\n | `jill (jill) <https://people.mozilla.org/s?query=jill>`__"
"\n | `otis (otis) <https://people.mozilla.org/s?query=otis>`__"
"\n | `unnamed <https://people.mozilla.org/s?query=unnamed>`__"
f"\n | `Jane François (jane) <{base_url}jane>`__"
f"\n | `Jill O'Sullivan (jill) <{base_url}jill>`__"
f"\n | `Otis Morris-West (otis) <{base_url}otis>`__"
f"\n | `unnamed <{base_url}unnamed>`__"
)