Add proper tests

This commit adds pytest, fixes up the repo structure to support pytest,
and adds tests for both configs. Tests use pyfakefs and pytest fixtures
to "magically" make ocflib functions refer to testing versions rather
than real configs in /etc/ocf.

Author: dkess

.gitignore

@@ -1,2 +1,3 @@
 /.tox
 /venv
+__pycache__/

.pre-commit-config.yaml

@@ -59,10 +59,3 @@ repos:
     hooks:
     -   id: remove-tabs
     -   id: remove-crlf
--   repo: local
-    hooks:
-    -   id: validate-schemas
-        name: Validate JSON schema on configs
-        entry: python validate.py
-        language: python
-        additional_dependencies: [jsonschema, pyyaml]

Makefile

@@ -1,21 +1,16 @@
 BIN := venv/bin
 PYTHON := $(BIN)/python
 
-.PHONY: .validate
-validate: venv
-	$(PYTHON) validate.py
-
 venv: requirements.txt
-	python ./vendor/venv-update venv= venv -ppython3 install= -r requirements.txt
+	python ./vendor/venv-update venv= venv -ppython3 install= -r requirements.txt -r requirements-dev.txt
 
 .PHONY: install-hooks
 install-hooks: venv
 	$(BIN)/pre-commit install -f --install-hooks
 
-test: lint validate
-
-.PHONY: lint
-lint: venv
+.PHONY: test
+test: venv
+	$(BIN)/py.test -v tests/
 	$(BIN)/pre-commit run --all-files
 
 .PHONY: clean

requirements-dev-minimal.txt

@@ -0,0 +1,6 @@
+jsonschema
+ocflib
+pre-commit
+pyfakefs
+PyYAML
+requirements-tools

requirements-dev.txt

@@ -0,0 +1,47 @@
+aspy.yaml==1.1.2
+atomicwrites==1.3.0
+attrs==18.2.0
+cached-property==1.5.1
+certifi==2018.11.29
+cfgv==1.4.0
+chardet==3.0.4
+cracklib==2.9.3
+dnspython==1.16.0
+identify==1.2.2
+idna==2.8
+importlib-metadata==0.8
+importlib-resources==1.0.2
+Jinja2==2.10
+jsonschema==2.6.0
+ldap3==2.5.2
+MarkupSafe==1.1.0
+more-itertools==6.0.0
+nodeenv==1.3.3
+ocflib==2019.2.20.14.19
+pathlib2==2.3.3
+pexpect==4.6.0
+pluggy==0.8.1
+ply==3.11
+pre-commit==1.14.4
+ptyprocess==0.6.0
+py==1.7.0
+pyasn1==0.4.5
+pycryptodome==3.7.3
+pycryptodomex==3.7.3
+pyfakefs==3.5.7
+PyMySQL==0.9.3
+pysmi==0.3.3
+pysnmp==4.4.9
+pytest==4.3.0
+python-dateutil==2.8.0
+PyYAML==3.13
+redis==3.2.0
+requests==2.21.0
+requirements-tools==1.2.1
+setuptools==40.8.0
+six==1.12.0
+SQLAlchemy==1.2.18
+toml==0.10.0
+urllib3==1.24.1
+virtualenv==16.4.0
+zipp==0.3.3

requirements-minimal.txt

@@ -1,3 +0,0 @@
-jsonschema==2.6.0
-pre-commit==1.14.0
-PyYAML==3.13

requirements.txt

@@ -0,0 +1,7 @@
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def etc(fs):
+    """Use pyfakefs in every test case"""
+    fs.add_real_directory('configs', target_path='/etc/ocf')

tests/conftest.py

@@ -0,0 +1,28 @@
+from datetime import date
+from datetime import datetime
+from datetime import time
+from datetime import timedelta
+
+from ocflib.lab.hours import read_hours_listing
+
+
+def test_hours_listing():
+    hours_listing = read_hours_listing()
+
+    today = date.today()
+
+    # Make sure that calling functions doesn't cause exceptions, now or in the
+    # future
+    for i in range(100):
+        hours_listing.hours_on_date(today + timedelta(days=i))
+        hours_listing.hours_on_date(today - timedelta(days=i + 1))
+
+        # Try every 10 minute interval on each day
+        for j in range(timedelta(days=1) // timedelta(minutes=10)):
+            fake_now = datetime.combine(
+                today + timedelta(days=i), time(),
+            ) + j * timedelta(minutes=10)
+
+            hours_listing.is_open(when=fake_now)
+            hours_listing.time_to_open(when=fake_now)
+            hours_listing.time_to_close(when=fake_now)

tests/hours_test.py

@@ -0,0 +1,30 @@
+import json
+import os
+
+import jsonschema
+import pytest
+import yaml
+
+# Disable pyfakefs
+@pytest.fixture
+def etc():
+    pass
+
+
+def test_validate():
+    configs = yaml.safe_load(open('configs/validate.yaml')).items()
+
+    for shortname, metadata in configs:
+        schema_filename = os.path.join('schemas', metadata['schema'])
+        config_filename = os.path.join('configs', shortname + '.yaml')
+
+        # PyYAML reads YAML date objects as Python date objects, which confuses
+        # jsonschema. To get around this, we convert the object to and from
+        # JSON, using the str function to convert the date objects to strings.
+        config = json.loads(
+            json.dumps(yaml.safe_load(open(config_filename)), default=str),
+        )
+
+        schema = json.load(open(schema_filename))
+
+        jsonschema.validate(config, schema)