From 00b9e6f9f79ee7d40da2729ccda4941611fd178c Mon Sep 17 00:00:00 2001 From: James Guthrie Date: Wed, 27 May 2015 20:40:02 +0200 Subject: [PATCH] Fix and document tests Closes #48 --- README.md | 9 +++++++++ pyretic/tests/tests.py | 4 ++-- pyretic/tests/unit_tests.py | 7 +++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1409b405..7919552b 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,12 @@ top-level structure: - pyretic.py: A wrapper that starts up Pyretic and optionally an OpenFlow client (see above) +## Tests + +The full test suite for pyretic can be run with: + +`py.test pyretic/tests/tests.py` + +Alternatively, only the unit tests can be run with: + +`py.test pyretic/tests/unit_tests.py` diff --git a/pyretic/tests/tests.py b/pyretic/tests/tests.py index 0e9a04ad..6db04294 100644 --- a/pyretic/tests/tests.py +++ b/pyretic/tests/tests.py @@ -1,2 +1,2 @@ -from unit_tests import * -from mininet_tests import * +from pyretic.tests.unit_tests import * +from pyretic.tests.mininet_tests import * diff --git a/pyretic/tests/unit_tests.py b/pyretic/tests/unit_tests.py index d5f649c1..0329af6c 100644 --- a/pyretic/tests/unit_tests.py +++ b/pyretic/tests/unit_tests.py @@ -1,2 +1,5 @@ -from test_language import * -from test_packet import * +from pyretic.tests.test_language import * +from pyretic.tests.test_packet import * +from pyretic.tests.test_re import * +from pyretic.tests.test_path import * +from pyretic.tests.test_specialization import *