Code cleanups

requirements.txt

@@ -0,0 +1,3 @@
+colorama==0.4.1
+websocket-client==0.56.0
+

setup.cfg

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 120
+ignore = E402,W503,W504,D

test_api/apitest/constants.py

@@ -18,8 +18,8 @@
 # You should have received a copy of the GNU General Public License      #
 # along with this program.  If not, see <https://www.gnu.org/licenses/>. #
 ##########################################################################
-BookNames = ['Gen', 'Exod', 'Lev', 'Num',  'Deut', 'Josh', 'Judg', 'Ruth', '1Sam', '2Sam', '1Kgs', '2Kgs', '1Chr',
+BookNames = ['Gen', 'Exod', 'Lev', 'Num', 'Deut', 'Josh', 'Judg', 'Ruth', '1Sam', '2Sam', '1Kgs', '2Kgs', '1Chr',
              '2Chr', 'Esra', 'Neh', 'Esth', 'Job', 'Ps', 'Prov', 'Eccl', 'Song', 'Isa', 'Jer', 'Lam', 'Ezek', 'Dan',
              'Hos', 'Joel', 'Amos', 'Obad', 'Jonah', 'Mic', 'Nah', 'Hab', 'Zeph', 'Hag', 'Zech', 'Mal', 'Matt', 'Mark',
              'Luke', 'John', 'Acts', 'Rom', '1Cor', '2Cor', 'Gal', 'Eph', 'Phil', 'Col', '1Thess', '2Thess', '1Tim',
-             '2Tim', 'Titus', 'Phlm', 'Heb',  'Jas', '1Pet', '2Pet', '1John', '2John', '3John', 'Jude', 'Rev']
+             '2Tim', 'Titus', 'Phlm', 'Heb', 'Jas', '1Pet', '2Pet', '1John', '2John', '3John', 'Jude', 'Rev']

test_api/apitest/logger.py

@@ -40,3 +40,7 @@ def print_warn(text: str):
 
 def print_info(text: str):
     print(Fore.MAGENTA + '[!] = ' + text)
+
+
+def print_debug(text: str):
+    print(Fore.CYAN + '[#] = ' + text)

test_api/apitest/runner.py

@@ -30,6 +30,7 @@ from websocket import create_connection
 from test_api.apitest.constants import BookNames
 
 from test_api.apitest.logger import print_text, print_error, print_ok, print_info
+# from test_api.apitest.logger import print_debug
 
 
 class RunTestsController(object):
@@ -61,7 +62,7 @@ class RunTestsController(object):
             print_error("Could not connect to WS! Exiting.")
 
     def on_message(self, message: str) -> None:
-        print_info("Message returned")
+        # print_debug("Message returned")
         self.result_stage = message
         self.compare_stage()
         self.received = True
@@ -128,10 +129,10 @@ class RunTestsController(object):
         print_ok('Running media test script')
         if self.load_and_check_sockets(True):
             clear_controllers(self)
-            #search_and_live(self, 'songs', 1)
-            #media_play(self)
-            #human_delay()
-            #clear_controllers(self)
+            # search_and_live(self, 'songs', 1)
+            # media_play(self)
+            # human_delay()
+            # clear_controllers(self)
             search_and_live(self, 'media', 1)
             media_play(self)
             human_delay(5)
@@ -265,7 +266,7 @@ def search_and_add(rtc: RunTestsController, plugin: str, count: int) -> None:
     print_text(f'Search_and_add for {plugin}')
     base_url = f'http://{rtc.address}:{rtc.http_port}/api/v2/plugins/{plugin}/'
     if plugin == 'bibles':
-        for i in range(1,  count):
+        for i in range(1, count):
             bk_id = random.randint(1, len(BookNames) - 1)
             bk = BookNames[bk_id]
             ch = random.randint(1, 10)
@@ -319,13 +320,13 @@ def live_item(rtc: RunTestsController, plugin: str) -> None:
     print_text(f'test_live_item - {plugin}')
     base_url = f'http://{rtc.address}:{rtc.http_port}/api/v2/'
     ret = requests.get(base_url + 'controller/live-item')
-    assert ret.status_code == 200
+    assert ret.status_code == 200, f'{ret.status_code} returned from live_item'
     i = 0
     for _ in json.loads(ret.text):
         ret = requests.post(base_url + 'controller/show', json=dict(id=i))
         i += 1
         human_delay()
-        assert ret.status_code == 204
+        assert ret.status_code == 204, f'{ret.status_code} returned from show'
         if plugin in {'image'}:
             check_websocket_changes(rtc, 0, 0)
         else: