From 63233aa5d82e101a457c2378749055945228ae4b Mon Sep 17 00:00:00 2001
From: Christine Lytwynec <clytwynec@edx.org>
Date: Wed, 20 May 2015 13:25:08 -0400
Subject: [PATCH] Fix cyclic import in pavelib

---
 pavelib/paver_tests/test_paver_bok_choy_cmds.py | 2 +-
 pavelib/utils/test/suites/__init__.py           | 1 +
 pavelib/utils/test/suites/acceptance_suite.py   | 2 +-
 pavelib/utils/test/suites/bokchoy_suite.py      | 2 +-
 pavelib/utils/test/suites/js_suite.py           | 2 +-
 pavelib/utils/test/suites/nose_suite.py         | 2 +-
 pavelib/utils/test/suites/python_suite.py       | 3 ++-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py
index 8100fe46f1..93e7950676 100644
--- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py
+++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py
@@ -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()
 
diff --git a/pavelib/utils/test/suites/__init__.py b/pavelib/utils/test/suites/__init__.py
index 44a57749dc..afc24bf7db 100644
--- a/pavelib/utils/test/suites/__init__.py
+++ b/pavelib/utils/test/suites/__init__.py
@@ -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
diff --git a/pavelib/utils/test/suites/acceptance_suite.py b/pavelib/utils/test/suites/acceptance_suite.py
index 2b9e899556..f9f8897b1b 100644
--- a/pavelib/utils/test/suites/acceptance_suite.py
+++ b/pavelib/utils/test/suites/acceptance_suite.py
@@ -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
diff --git a/pavelib/utils/test/suites/bokchoy_suite.py b/pavelib/utils/test/suites/bokchoy_suite.py
index e8901c9f53..356d7f1711 100644
--- a/pavelib/utils/test/suites/bokchoy_suite.py
+++ b/pavelib/utils/test/suites/bokchoy_suite.py
@@ -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
diff --git a/pavelib/utils/test/suites/js_suite.py b/pavelib/utils/test/suites/js_suite.py
index 0adf4f4dd1..ff111a440f 100644
--- a/pavelib/utils/test/suites/js_suite.py
+++ b/pavelib/utils/test/suites/js_suite.py
@@ -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
diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py
index c0597e668c..d43f6f3205 100644
--- a/pavelib/utils/test/suites/nose_suite.py
+++ b/pavelib/utils/test/suites/nose_suite.py
@@ -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
diff --git a/pavelib/utils/test/suites/python_suite.py b/pavelib/utils/test/suites/python_suite.py
index 7fdcd1344d..85337d6e89 100644
--- a/pavelib/utils/test/suites/python_suite.py
+++ b/pavelib/utils/test/suites/python_suite.py
@@ -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