Merge branch 'develop' into master

tests/sickrage_tests/show/coming_episodes_tests.py

@@ -44,7 +44,7 @@ class ComingEpisodesTests(unittest.TestCase):
     """
     def test_get_categories(self):
         """
-        Test get categories
+        Tests if get_categories returns the valid format and the right values
         """
         categories_list = [
             None, [], ['A', 'B'], ['A', 'B'], '', 'A|B', 'A|B',
@@ -63,7 +63,7 @@ class ComingEpisodesTests(unittest.TestCase):
 
     def test_get_categories_map(self):
         """
-        Test get categories map
+        Tests if get_categories_map returns the valid format and the right values
         """
         categories_list = [
             None, [], ['A', 'B'], ['A', 'B']
@@ -82,7 +82,7 @@ class ComingEpisodesTests(unittest.TestCase):
 
     def test_get_sort(self):
         """
-        Test get sort
+        Tests if get_sort returns the right sort of coming episode
         """
         test_cases = {
             None: 'date',

tests/sickrage_tests/show/history_tests.py

@@ -43,7 +43,7 @@ class HistoryTests(unittest.TestCase):
     """
     def test_get_actions(self):
         """
-        Test get actions
+        Tests whether or not the different kinds of actions an episode can have are returned correctly
         """
         test_cases = {
             None: [],
@@ -70,7 +70,7 @@ class HistoryTests(unittest.TestCase):
 
     def test_get_limit(self):
         """
-        Test get limit
+        Tests the static get limit method which should return the limit on the amount of elements that should be shown/returned
         """
         test_cases = {
             None: 0,

tests/sickrage_tests/show/show_tests.py

@@ -48,7 +48,7 @@ class ShowTests(unittest.TestCase):
 
     def test_find(self):
         """
-        Test find
+        Test find tv shows by indexer_id
         """
         sickbeard.QUALITY_DEFAULT = Quality.FULLHDTV
 
@@ -94,7 +94,7 @@ class ShowTests(unittest.TestCase):
 
     def test_validate_indexer_id(self):
         """
-        Test validate indexer id
+        Tests if the indexer_id is valid and if so if it returns the right show
         """
         sickbeard.QUALITY_DEFAULT = Quality.FULLHDTV