blob: b844193a802d5966006a4b1bce975f1f269af6de (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
--- test/testspf.py.orig 2019-08-31 02:49:19 UTC
+++ test/testspf.py
@@ -237,9 +237,9 @@ def docsuite():
def suite(skipdoc=False):
suite = docsuite()
- suite.addTest(makeSuite('test.yml'))
- suite.addTest(makeSuite('rfc7208-tests.yml'))
- suite.addTest(makeSuite('rfc4408-tests.yml'))
+ suite.addTest(makeSuite('test/test.yml'))
+ suite.addTest(makeSuite('test/rfc7208-tests.yml'))
+ suite.addTest(makeSuite('test/rfc4408-tests.yml'))
return suite
if __name__ == '__main__':
@@ -255,9 +255,9 @@ if __name__ == '__main__':
# a specific test selected by id from YAML files
if not tc:
tc = unittest.TestSuite()
- t0 = loadYAML('rfc7208-tests.yml')
- t1 = loadYAML('rfc4408-tests.yml')
- t2 = loadYAML('test.yml')
+ t0 = loadYAML('test/rfc7208-tests.yml')
+ t1 = loadYAML('test/rfc4408-tests.yml')
+ t2 = loadYAML('test/test.yml')
if i in t0:
tc.addTest(SPFTestCase(t0[i]))
if i in t1:
@@ -266,7 +266,7 @@ if __name__ == '__main__':
tc.addTest(SPFTestCase(t2[i]))
if not tc:
# load zonedata for doctests
- with open('doctest.yml','rb') as fp:
+ with open('test/doctest.yml','rb') as fp:
zonedata = loadZone(next(yaml.safe_load_all(fp)))
if doctest:
tc = docsuite() # doctests only
|