merged stable into default

1 files changed, 11 insertions, 13 deletions

diff --git a/tests/test_api.py b/tests/test_api.py
index f8901f731..0171b46bb 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1,20 +1,18 @@
-# -*- coding: utf-8 -*-
 
-from module.common import APIExerciser
-from nose.tools import nottest
+from unittest import TestCase
 
+from pyLoadCore import Core
+from module.common.APIExerciser import APIExerciser
 
-class TestApi:
+class TestApi(TestCase):
 
-    def __init__(self):
-        self.api = APIExerciser.APIExerciser(None, True, "TestUser", "pwhere")
+    @classmethod
+    def setUpClass(cls):
+        cls.core = Core()
+        cls.core.start(False, False, True)
 
-    def test_login(self):
-        assert self.api.api.login("crapp", "wrong pw") is False
-
-    #takes really long, only test when needed
-    @nottest
     def test_random(self):
+        api = APIExerciser(self.core)
 
-        for i in range(0, 100):
-            self.api.testAPI()
+        for i in range(2000):
+            api.testAPI()