tox fixes for transport things

Author: allmightyspiff

SoftLayer/managers/hardware.py

@@ -78,9 +78,12 @@ def cancel_hardware(self, hardware_id, reason='unneeded', comment='', immediate=
         reasons = self.get_cancellation_reasons()
         cancel_reason = reasons.get(reason, reasons['unneeded'])
         ticket_mgr = SoftLayer.TicketManager(self.client)
-        mask = 'mask[id, hourlyBillingFlag, billingItem[id], openCancellationTicket[id]]'
+        mask = 'mask[id, hourlyBillingFlag, billingItem[id], openCancellationTicket[id], activeTransaction]'
         hw_billing = self.get_hardware(hardware_id, mask=mask)
 
+        if 'activeTransaction' in hw_billing:
+            raise SoftLayer.SoftLayerError("Unable to cancel hardware with running transaction")
+
         if 'billingItem' not in hw_billing:
             raise SoftLayer.SoftLayerError("Ticket #%s already exists for this server" %
                                            hw_billing['openCancellationTicket']['id'])

SoftLayer/transports.py

@@ -21,7 +21,7 @@
 
 LOGGER = logging.getLogger(__name__)
 # transports.Request does have a lot of instance attributes. :(
-# pylint: disable=too-many-instance-attributes
+# pylint: disable=too-many-instance-attributes, no-self-use
 
 __all__ = [
     'Request',
@@ -486,7 +486,7 @@ def get_last_calls(self):
 
     def print_reproduceable(self, call):
         """Not Implemented"""
-        return "Not Implemented"
+        return call.service
 
 
 class FixtureTransport(object):
@@ -505,7 +505,7 @@ def __call__(self, call):
 
     def print_reproduceable(self, call):
         """Not Implemented"""
-        return "Not Implemented"
+        return call.service
 
 
 def _proxies_dict(proxy):

tests/managers/vs_tests.py

@@ -809,19 +809,6 @@ def test_active_provision_pending(self, _now, _sleep):
         _sleep.assert_has_calls([mock.call(0)])
         self.assertFalse(value)
 
-    def test_active_reload(self):
-        # actively running reload
-        self.guestObject.side_effect = [
-            {'activeTransaction': {'id': 1}},
-            {
-                'activeTransaction': {'id': 1},
-                'provisionDate': 'aaa',
-                'lastOperatingSystemReload': {'id': 1},
-            },
-        ]
-        value = self.vs.wait_for_ready(1, 0)
-        self.assertFalse(value)
-
     def test_reload_no_pending(self):
         # reload complete, maintance transactions
         self.guestObject.return_value = {