Merge pull request #10 from luto/test-docs

support running the tests on Arch

Author: fincham

README.md

@@ -46,9 +46,17 @@ autorestart=true
 
 ## Running tests
 
-The tests expect to be run on a Debian or Ubuntu system using the official PowerDNS 4.1.x upstream packages. You'll need `pytest` and `pytest-flask` installed, as well as the `pdns-server` and `pdns-backend-sqlite3` OS packages.
+### Setup
 
-You can then run tests by running `pytest -v` inside the source directory.
+* Ubuntu / Debian
+
+  The officially supported system for testing is Debian or Ubuntu. To start, install the the official PowerDNS 4.1.x upstream packages: `pdns-server` and `pdns-backend-sqlite3`.
+
+* Arch
+
+  The tests can also be run on Arch Linux. Install the `powerdns` package.
+
+Additonally a few python modules need to be installed to run the tests (mainly `pytest`): `pip install -r requirements-dev.txt`. You can then run tests by running `pytest -v` inside the source directory.
 
 ## Authenticating
 

powerdns_auth_proxy/tests/test_proxy.py

@@ -2,6 +2,7 @@
 import base64
 import json
 import os
+import os.path
 import subprocess
 import tempfile
 import time
@@ -67,9 +68,19 @@ def client():
     app = create_app(test_config)
     app.config['TESTING'] = True
 
+
+    ALL_SCHEMA_PATHS = [
+        '/usr/share/doc/pdns-backend-sqlite3/schema.sqlite3.sql',
+        '/usr/share/doc/powerdns/schema.sqlite3.sql',
+    ]
+    schema_paths = list(filter(os.path.exists, ALL_SCHEMA_PATHS))
+
+    if not schema_paths:
+        raise Exception('Unsupported OS. Cannot find example sqlite schema. Looked in: ' + ':'.join(ALL_SCHEMA_PATHS))
+
     # create an empty database from the supplied schema
     with closing(sqlite3.connect(pdns_db_path)) as db:
-        with app.open_resource('/usr/share/doc/pdns-backend-sqlite3/schema.sqlite3.sql', mode='r') as f:
+        with app.open_resource(schema_paths[0], mode='r') as f:
             db.cursor().executescript(f.read())
         db.execute("INSERT INTO domains (name, type, account) VALUES ('example.net', 'MASTER', 'nobody');") # create a domain that the demo user can't read later
         db.commit()

requirements-dev.txt

@@ -0,0 +1,2 @@
+pytest
+pytest-flask