Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8128 from edx/clytwynec/fix_cyclic_import_in_pavelib

Browse Source 
Fix cyclic import in pavelib
This commit is contained in:
Christine Lytwynec
2015-05-20 16:51:10 -04:00
parent a2cbd16680 63233aa5d8
commit 2f6cff5d69
7 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pavelib/paver_tests/test_paver_bok_choy_cmds.py
View File

@@ -1,7 +1,7 @@
import os
import unittest
from pavelib.utils.test.suites.bokchoy_suite import BokChoyTestSuite
from pavelib.utils.test.suites import BokChoyTestSuite
REPO_DIR = os.getcwd()

1
pavelib/utils/test/suites/__init__.py
View File

@@ -6,3 +6,4 @@ from .nose_suite import NoseTestSuite, SystemTestSuite, LibTestSuite
from .python_suite import PythonTestSuite
from .js_suite import JsTestSuite
from .acceptance_suite import AcceptanceTestSuite
from .bokchoy_suite import BokChoyTestSuite

2
pavelib/utils/test/suites/acceptance_suite.py
View File

@@ -3,7 +3,7 @@ Acceptance test suite
"""
from paver.easy import sh, call_task
from pavelib.utils.test import utils as test_utils
from pavelib.utils.test.suites import TestSuite
from pavelib.utils.test.suites.suite import TestSuite
from pavelib.utils.envs import Env
__test__ = False # do not collect

2
pavelib/utils/test/suites/bokchoy_suite.py
View File

@@ -4,7 +4,7 @@ Class used for defining and running Bok Choy acceptance test suite
from time import sleep
from paver.easy import sh
from pavelib.utils.test.suites import TestSuite
from pavelib.utils.test.suites.suite import TestSuite
from pavelib.utils.envs import Env
from pavelib.utils.test import bokchoy_utils
from pavelib.utils.test import utils as test_utils

2
pavelib/utils/test/suites/js_suite.py
View File

@@ -3,7 +3,7 @@ Javascript test tasks
"""
from pavelib import assets
from pavelib.utils.test import utils as test_utils
from pavelib.utils.test.suites import TestSuite
from pavelib.utils.test.suites.suite import TestSuite
from pavelib.utils.envs import Env
__test__ = False # do not collect

2
pavelib/utils/test/suites/nose_suite.py
View File

@@ -4,7 +4,7 @@ Classes used for defining and running nose test suites
import os
from paver.easy import call_task
from pavelib.utils.test import utils as test_utils
from pavelib.utils.test.suites import TestSuite
from pavelib.utils.test.suites.suite import TestSuite
from pavelib.utils.envs import Env
__test__ = False # do not collect

3
pavelib/utils/test/suites/python_suite.py
View File

@@ -2,7 +2,8 @@
Classes used for defining and running python test suites
"""
from pavelib.utils.test import utils as test_utils
from pavelib.utils.test.suites import TestSuite, LibTestSuite, SystemTestSuite
from pavelib.utils.test.suites.suite import TestSuite
from pavelib.utils.test.suites.nose_suite import LibTestSuite, SystemTestSuite
from pavelib.utils.envs import Env
__test__ = False # do not collect