commit 8699e7b5ff401be2c5823274d3ee029503b81a1c
author Scott Baker <smbaker@gmail.com> Thu Jul 05 13:11:14 2018 -0700
committer Scott Baker <smbaker@gmail.com> Thu Jul 05 13:13:55 2018 -0700
tree 8dbd71b9fd6a364c18b48c905a5463b8cfa79486
parent e48a4641bcace15fe6e7bab010e075f81161ff44

CORD-3199 fix exception when running onu device tests

Change-Id: Ica2057208381038c715b73bf5e0e9e6fc406d565

xos/synchronizer/steps/test_sync_onu_device.py

diff --git a/xos/synchronizer/steps/test_sync_onu_device.py b/xos/synchronizer/steps/test_sync_onu_device.py
index 3cf1062..329774a 100644
--- a/xos/synchronizer/steps/test_sync_onu_device.py
+++ b/xos/synchronizer/steps/test_sync_onu_device.py
@@ -54,7 +54,6 @@
         Config.init(config, "synchronizer-config-schema.yaml")
         # END Setting up the config module
 
-        from synchronizers.new_base.syncstep import DeferredException
         from synchronizers.new_base.mock_modelaccessor_build import build_mock_modelaccessor
         # build_mock_modelaccessor(xos_dir, services_dir, [get_models_fn("olt-service", "volt.xproto")])
 
@@ -64,6 +63,7 @@
                                                          get_models_fn("vsg", "vsg.xproto"),
                                                          get_models_fn("../profiles/rcord", "rcord.xproto")])
         import synchronizers.new_base.modelaccessor
+        from synchronizers.new_base.syncstep import DeferredException
         from sync_onu_device import SyncONUDevice, model_accessor
 
         # import all class names to globals

xos/synchronizer/steps/test_sync_volt_service_instance.py

diff --git a/xos/synchronizer/steps/test_sync_volt_service_instance.py b/xos/synchronizer/steps/test_sync_volt_service_instance.py
index bf994d3..2df696e 100644
--- a/xos/synchronizer/steps/test_sync_volt_service_instance.py
+++ b/xos/synchronizer/steps/test_sync_volt_service_instance.py
@@ -58,7 +58,6 @@
         Config.init(config, "synchronizer-config-schema.yaml")
         # END Setting up the config module
 
-        from synchronizers.new_base.syncstep import DeferredException
         from synchronizers.new_base.mock_modelaccessor_build import build_mock_modelaccessor
         # build_mock_modelaccessor(xos_dir, services_dir, [get_models_fn("olt-service", "volt.xproto")])
 
@@ -68,6 +67,7 @@
                                                          get_models_fn("vsg", "vsg.xproto"),
                                                          get_models_fn("../profiles/rcord", "rcord.xproto")])
         import synchronizers.new_base.modelaccessor
+        from synchronizers.new_base.syncstep import DeferredException
         from sync_volt_service_instance import SyncVOLTServiceInstance, model_accessor
 
         # import all class names to globals