From 622a734405531bb2da0a435c04bd116ea2e9a8ed Mon Sep 17 00:00:00 2001
From: Ebag333 <ebagola@gmail.com>
Date: Tue, 13 Dec 2016 23:35:29 -0800
Subject: [PATCH] remove lazy import. Fix test

---
 gui/fleetBrowser.py   |  4 ++--
 tests/test_package.py | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gui/fleetBrowser.py b/gui/fleetBrowser.py
index ab50e58ca..600351eee 100644
--- a/gui/fleetBrowser.py
+++ b/gui/fleetBrowser.py
@@ -1,7 +1,7 @@
 import wx
 from wx.lib.buttons import GenBitmapButton
 
-import service.fleet
+from service.fleet import Fleet
 import gui.mainFrame
 import gui.utils.colorUtils as colorUtils
 import gui.sfBrowserItem as SFItem
@@ -23,7 +23,7 @@ class FleetBrowser(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent)
 
-        self.sFleet = service.fleet.Fleet.getInstance()
+        self.sFleet = Fleet.getInstance()
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 
         mainSizer = wx.BoxSizer(wx.VERTICAL)
diff --git a/tests/test_package.py b/tests/test_package.py
index b63076b47..74450c866 100644
--- a/tests/test_package.py
+++ b/tests/test_package.py
@@ -17,7 +17,6 @@ def test_packages():
     assert eos
     assert utils
 
-
 def service_modules():
     for root, folders, files in os.walk("service"):
         for file_ in files:
@@ -28,7 +27,16 @@ def service_modules():
                 )
                 yield mod_name
 
+def eos_modules():
+    for root, folders, files in os.walk("eos"):
+        for file_ in files:
+            if file_.endswith(".py") and not file_.startswith("_"):
+                mod_name = "{}.{}".format(
+                    root.replace("/", "."),
+                    file_.split(".py")[0],
+                )
+                yield mod_name
 
-@pytest.mark.parametrize("mod_name", service_modules())
+@pytest.mark.parametrize("mod_name", eos_modules())
 def test_service_imports(mod_name):
     assert importlib.import_module(mod_name)