Merge pull request #24 from thraxil/relative-imports

switch to relative import

Author: nikolas

.travis.yml

@@ -16,7 +16,7 @@ install:
 - pip install flake8
 - pip install coveralls
 script:
-- flake8 smoketest
+- flake8 smoketest exceptionstest main testapp
 - python runtests.py
 - coverage run --source=smoketest runtests.py
 after_success:

Makefile

@@ -3,7 +3,7 @@ test:
 	virtualenv ve
 	./ve/bin/pip install .
 	./ve/bin/pip install flake8
-	./ve/bin/flake8 smoketest --max-complexity=9
+	./ve/bin/flake8 smoketest exceptionstest main testapp --max-complexity=9
 	./ve/bin/python runtests.py
 
 clean:

exceptionstest/smoke.py

@@ -1,12 +1,9 @@
 from smoketest import SmokeTest
 from exceptionstest import EXC_MSG
 
-
-
-# raise exception here so we can test what will happen when we got any exception
-# from smoke.py file
-raise Exception(EXC_MSG) 
-
+# raise exception here so we can test what will happen when
+# we got any exception from smoke.py file
+raise Exception(EXC_MSG)
 
 
 class TestSmokeTestWithExceptions(SmokeTest):

main/tests.py

@@ -16,16 +16,17 @@ class BasicTest(TestCase):
     class TestWithException(SmokeTest):
         def test_fail(self):
             self.assertTrue(False, BasicTest._FAIL_MSG)
+
         def test_with_exception(self):
             raise Exception(BasicTest._EXC_MSG)
+
         def dir(self):
             """ Overvrite dir method so test_fail would be before
             test_with_exception for sure.
 
             """
             return ['test_fail', 'test_with_exception']
 
-
     def setUp(self):
         settings.INSTALLED_APPS = ('main', 'smoketest')
         self.c = Client()
@@ -52,6 +53,10 @@ def test_basics(self):
             TestFailedSmokeTests.CUSTOM_TEST_MSG,
             response.content.decode('utf-8'))
 
+    def test_extendable(self):
+        response = self.c.get("/extendable/")
+        self.assertEqual(response.status_code, 500)
+
     def test_json(self):
         " Testing JSON response. "
         json_content_type = 'application/json'
@@ -77,7 +82,6 @@ def test_json(self):
             TestFailedSmokeTests.CUSTOM_TEST_MSG,
             response_obj['failed_tests'])
 
-
     def test_error(self):
         " Tests the error case (when we got exception during the smoke test). "
         test = self.TestWithException()
@@ -86,14 +90,14 @@ def test_error(self):
         self.assertEqual(1, errored)
         self.assertEqual(errored, len(e_tests))
         self.assertIn(
-                "TestWithException.test_with_exception errored: %s" %
-                        BasicTest._EXC_MSG,
-                e_tests[0])
+            "TestWithException.test_with_exception errored: %s" %
+            BasicTest._EXC_MSG,
+            e_tests[0])
         self.assertNotIn(BasicTest._FAIL_MSG, e_tests[0])
 
-
     def test_logging(self):
-        " On failure and on errors, messages should be logged by setup method. "
+        """ On failure and on errors, messages should be logged by setup method.
+        """
         _logged_msgs = []
 
         def logger_mock(msg):
@@ -108,13 +112,13 @@ def __init__(self):
 
         TestForLogging().run()
 
-        # After this, both fail and error message should be logged (should be in
-        # _looged_msgs array).
+        # After this, both fail and error message should be logged
+        # (should be in _looged_msgs array).
         self.assertEqual(2, len(_logged_msgs))
         # As stated in TestWithException, the fake test will be the first for
         # sure.
         self.assertIn(BasicTest._FAIL_MSG, _logged_msgs[0])
         self.assertIn(
-                "TestForLogging.test_with_exception errored: %s" %
-                        BasicTest._EXC_MSG,
-                _logged_msgs[1])
+            "TestForLogging.test_with_exception errored: %s" %
+            BasicTest._EXC_MSG,
+            _logged_msgs[1])

smoketest/views.py

@@ -7,7 +7,7 @@
 import inspect
 import importlib
 import time
-from smoketest import SmokeTest, ApplicationTestResultSet
+from . import SmokeTest, ApplicationTestResultSet
 
 
 def test_class(cls):

testapp/urls.py

@@ -3,6 +3,9 @@
 except ImportError:
     from django.conf.urls.defaults import include, url
 
+from .views import TestView
+
 urlpatterns = [
     url('^smoketest/$', include('smoketest.urls')),
+    url('^extendable/$', TestView.as_view()),
 ]

testapp/views.py

@@ -0,0 +1,9 @@
+"""
+Just make sure that the main view is extendable
+"""
+
+from smoketest.views import IndexView
+
+
+class TestView(IndexView):
+    pass