Merge pull request #795 from adam111316/travis

Update .travis.yml, fix imports and tests

.travis.yml

@@ -4,11 +4,8 @@ python:
   - 2.6
   - 2.7
 
-# whitelist
-branches:
-  only:
-    - ThePirateBay
-    - Pistachitos
+install:
+  - pip install cheetah
  
 before_script: cd ./tests
-script: ./all_tests.py
+script: python all_tests.py

sickbeard/__init__.py

@@ -28,6 +28,8 @@ from threading import Lock
 
 # apparently py2exe won't build these unless they're imported somewhere
 import sys
+import os.path
+sys.path.append(os.path.abspath('../lib'))
 from sickbeard import providers, metadata, config, webserveInit
 from sickbeard.providers.generic import GenericProvider
 from providers import ezrss, tvtorrents, btn, newznab, womble, thepiratebay, torrentleech, kat, iptorrents, \

tests/all_tests.py

@@ -21,13 +21,13 @@
 if __name__ == "__main__":
     import glob
     import unittest
+    import sys
 
     test_file_strings = [ x for x in glob.glob('*_tests.py') if not x in __file__]
     module_strings = [file_string[0:len(file_string) - 3] for file_string in test_file_strings]
     suites = [unittest.defaultTestLoader.loadTestsFromName(file_string) for file_string in module_strings]
     testSuite = unittest.TestSuite(suites)
 
-
     print "=================="
     print "STARTING - ALL TESTS"
     print "=================="
@@ -35,5 +35,6 @@ if __name__ == "__main__":
     for includedfiles in test_file_strings:
         print "- " + includedfiles
 
-
     text_runner = unittest.TextTestRunner().run(testSuite)
+    if not text_runner.wasSuccessful():
+        sys.exit(-1)