move helpers functions out

(cherry picked from commit 2047d3f)

tests/test_modules/gui/test_aboutData.py

@@ -1,5 +1,13 @@
-from gui.aboutData import versionString, licenses, developers, credits, description
+import os
+import sys
 
+'''
+script_dir = os.path.dirname(os.path.abspath(__file__))
+# Add root folder to python paths
+sys.path.append(os.path.realpath(os.path.join(script_dir, '..', '..')))
+'''
+
+from gui.aboutData import versionString, licenses, developers, credits, description
 
 def test_aboutData():
     """

tests/test_modules/service/test_attribute.py

@@ -1,3 +1,12 @@
+import os
+import sys
+
+'''
+script_dir = os.path.dirname(os.path.abspath(__file__))
+# Add root folder to python paths
+sys.path.append(os.path.realpath(os.path.join(script_dir, '..', '..')))
+'''
+
 from service.attribute import Attribute
 
 

tests/test_smoketests/helpers.py

@@ -1,67 +0,0 @@
-# noinspection PyPackageRequirements
-import pytest
-
-import os
-import sys
-
-script_dir = os.path.dirname(os.path.abspath(__file__))
-# Add root folder to python paths
-sys.path.append(os.path.realpath(os.path.join(script_dir, '..', '..')))
-
-
-# noinspection PyUnresolvedReferences,PyUnusedLocal
-@pytest.fixture
-def DBInMemory():
-    print("Creating database in memory")
-    import eos.config
-    from os.path import realpath, join, dirname, abspath
-
-    debug = False
-    gamedataCache = True
-    saveddataCache = True
-    gamedata_version = ""
-    eos.config.gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(unicode(__file__))), "..", "..", "eve.db"))
-    # saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
-    eos.config.saveddata_connectionstring = 'sqlite:///:memory:'
-
-    import eos
-    import eos.db
-
-    # Output debug info to help us troubleshoot Travis
-    print(eos.db.saveddata_engine)
-    print(eos.db.gamedata_engine)
-
-    helper = {
-        'config': eos.config,
-        'db'    : eos.db,
-    }
-    return helper
-
-
-@pytest.fixture
-def Gamedata():
-    print("Building Gamedata")
-    from eos.gamedata import Item
-
-    helper = {
-        'Item': Item,
-    }
-    return helper
-
-
-@pytest.fixture
-def Saveddata():
-    print("Building Saveddata")
-    from eos.saveddata.ship import Ship
-    from eos.saveddata.fit import Fit
-    from eos.saveddata.character import Character
-    from eos.saveddata.module import Module, State
-
-    helper = {
-        'Ship'     : Ship,
-        'Fit'      : Fit,
-        'Character': Character,
-        'Module'   : Module,
-        'State'    : State,
-    }
-    return helper

tests/test_smoketests/test_rifter.py

@@ -1,19 +1,8 @@
 # noinspection PyPackageRequirements
+
 import pytest
 
-import os
-import sys
-
-script_dir = os.path.dirname(os.path.abspath(__file__))
-# Add this folder to paths so we can import our helpers
-sys.path.append(os.path.realpath(os.path.join(script_dir)))
-
-# noinspection PyUnresolvedReferences
-from helpers import DBInMemory as DB
-# noinspection PyUnresolvedReferences
-from helpers import Gamedata
-# noinspection PyUnresolvedReferences
-from helpers import Saveddata
+from _development.helpers import DBInMemory as DB, Gamedata, Saveddata
 
 
 # noinspection PyShadowingNames