Merge branch 'CPS-20-deprecated'

cloudblue · May 17, 2019 · f463797 · f463797
2 parents 2cc0c5d + d072977
commit f463797
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/connect/__init__.py b/connect/__init__.py
@@ -7,14 +7,15 @@
 
 from deprecation import deprecated
 
-import resources
+from .resources import FulfillmentAutomation as BaseFulfillmentAutomation
+from .resources import TierConfigAutomation as BaseTierConfigAutomation
 
 
 # TODO: These classes will be removed in the future.
 # They are now located in connect.resources package.
 
 
-class FulfillmentAutomation(resources.FulfillmentAutomation):
+class FulfillmentAutomation(BaseFulfillmentAutomation):
     __metaclass__ = ABCMeta
 
     @deprecated(deprecated_in='16.0',
@@ -23,7 +24,7 @@ def __init__(self, config=None):
         super(FulfillmentAutomation, self).__init__(config)
 
 
-class TierConfigAutomation(resources.TierConfigAutomation):
+class TierConfigAutomation(BaseTierConfigAutomation):
     __metaclass__ = ABCMeta
 
     @deprecated(deprecated_in='16.0',

diff --git a/tests/test_migration_handler.py b/tests/test_migration_handler.py
@@ -145,8 +145,8 @@ def test_migration_wrong_info(info_mock, debug_mock, error_mock):
                                   '"licNumber":"10"}')
 
     assert error_mock.call_count == 1
-    error_mock.assert_called_with('[MIGRATION::PR-7001-1234-5678] Extra data: '
-                                  'line 1 column 17 - line 1 column 179 (char 16 - 178)')
+    error_mock.assert_called_with('[MIGRATION::PR-7001-1234-5678] '
+                                  'Extra data: line 1 column 17 (char 16)')
 
 
 @patch('connect.migration_handler.logger.debug')