Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
move tests dir to test
  • Loading branch information
ingydotnet committed Mar 30, 2013
1 parent 51f967f commit 179b085
Show file tree
Hide file tree
Showing 19 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -12,7 +12,7 @@

class Test(Command):
user_options = []
test_dir = 'tests'
test_dir = 'test'

def initialize_options(self):
pass
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions tests/testml_runner.py → test/testml_runner.py
@@ -1,6 +1,6 @@
import sys
sys.path.insert(0, '.')
sys.path.insert(0, './tests')
sys.path.insert(0, './test')

import unittest
import testml
Expand All @@ -20,9 +20,9 @@ def run_testml_file(self, file_, compiler=testml.compiler.pegex.Pegex):
compiler = compiler,
).run(self)

files = glob.glob('tests/testml/*.tml')
files = glob.glob('test/testml/*.tml')
files.sort()
files = map(lambda f: f.replace('tests/', ''), files)
files = map(lambda f: f.replace('test/', ''), files)
files = filter(lambda f: not(re.search(r'external[12]', f)), files)
for file_ in files:
method_name = 'test_' + re.sub(r'\W', '_', file_)
Expand All @@ -32,10 +32,10 @@ def method(self, file_ = file_):
setattr(TestMLTestCase, method_name, method)

files = """
tests/arguments.tml
tests/basic.tml
tests/exceptions.tml
tests/semicolons.tml
test/arguments.tml
test/basic.tml
test/exceptions.tml
test/semicolons.tml
""".strip().split()
for file_ in files:
method_name = 'test_lite_' + re.sub(r'\W', '_', file_)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion testml/setup.py
Expand Up @@ -4,7 +4,7 @@
import os.path
import shutil

DEFAULT_TESTML_CONF = './tests/testml.yaml'
DEFAULT_TESTML_CONF = './test/testml.yaml'

class Setup():
def setup(self, testml_conf = DEFAULT_TESTML_CONF):
Expand Down

0 comments on commit 179b085

Please sign in to comment.