Merge pull request #63 from gtaylor/travis

radzhome · radzhome · commit 2e4763d75df3 · 2016-01-06T17:43:56.000-05:00
Travis
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,13 @@
+language: python
+sudo: false
+python:
+  - "2.7"
+  - "3.5"
+
+# command to install dependencies
+install:
+  - pip install .
+  - pip install -r requirements.txt
+
+# command to run tests
+script: nosetests
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,8 @@ Change Log
 * Added [Validation]AvailabilityAndCommitmentService_v4.wsdl for AVC service. (radzhome)
 * Added examples and unit tests for AVC service.
 * Refactored examples and documentation. (radzhome)
+* A quick PEP8 pass using pycharm on most of the codebase (radzhome)
+* Add travis yml (radzhome)
 
 
 2.0.0
diff --git a/fedex/config.py b/fedex/config.py
@@ -70,5 +70,5 @@ def __init__(self, key, password, account_number=None, meter_number=None, freigh
         if wsdl_path is None:
             self.wsdl_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                           'wsdl')
-        else:
+        else:  # pragma: no cover
             self.wsdl_path = wsdl_path
diff --git a/fedex/services/package_movement.py b/fedex/services/package_movement.py
@@ -57,7 +57,7 @@ def _check_response_for_request_errors(self):
         this WSDL.
         """
         if self.response.HighestSeverity == "ERROR":
-            for notification in self.response.Notifications:
+            for notification in self.response.Notifications:  # pragma: no cover
                 if notification.Severity == "ERROR":
                     if "Postal Code Not Found" in notification.Message:
                         raise FedexPostalCodeNotFound(notification.Code,
diff --git a/fedex/services/ship_service.py b/fedex/services/ship_service.py
@@ -210,6 +210,6 @@ def _assemble_and_send_request(self):
             ClientDetail=self.ClientDetail,
             TransactionDetail=self.TransactionDetail,
             Version=self.VersionId,
-            ShipTimestamp=datetime.now(),
+            ShipTimestamp=datetime.datetime.now(),
             TrackingId=self.TrackingId,
             DeletionControl=self.DeletionControlType)
diff --git a/fedex/services/track_service.py b/fedex/services/track_service.py
@@ -82,7 +82,7 @@ def _check_response_for_request_errors(self):
         Checks the response to see if there were any errors specific to
         this WSDL.
         """
-        if self.response.HighestSeverity == "ERROR":
+        if self.response.HighestSeverity == "ERROR":  # pragma: no cover
             for notification in self.response.Notifications:
                 if notification.Severity == "ERROR":
                     if "Invalid tracking number" in notification.Message:
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+suds-jurko
diff --git a/tests/common.py b/tests/common.py
@@ -10,8 +10,8 @@ def get_test_config():
     Returns a basic FedexConfig to test with.
     """
     # Test server (Enter your credentials here)
-    return FedexConfig(key='xxxxxxxxxxxxxxxxx',
-                       password='xxxxxxxxxxxxxxxxxxxxxxxxx',
-                       account_number='xxxxxxxxx',
-                       meter_number='xxxxxxxxxx',
+    return FedexConfig(key='',
+                       password='',
+                       account_number='',
+                       meter_number='',
                        use_test_server=True)
diff --git a/tests/test_address_validation_service.py b/tests/test_address_validation_service.py
@@ -15,6 +15,7 @@
 CONFIG_OBJ = get_test_config()
 
 
+@unittest.skipIf(not CONFIG_OBJ.account_number, "No credentials provided.")
 class AddressValidationServiceTests(unittest.TestCase):
     """
     These tests verify that the address validation service WSDL is in good shape.
diff --git a/tests/test_availability_commitment_service.py b/tests/test_availability_commitment_service.py
@@ -15,6 +15,7 @@
 CONFIG_OBJ = get_test_config()
 
 
+@unittest.skipIf(not CONFIG_OBJ.account_number, "No credentials provided.")
 class AvailabilityCommitmentServiceTests(unittest.TestCase):
     """
     These tests verify that the shipping service WSDL is in good shape.
diff --git a/tests/test_config_object.py b/tests/test_config_object.py
@@ -0,0 +1,39 @@
+"""
+Test module for the Fedex Config Object.
+"""
+
+import unittest
+
+import sys
+
+sys.path.insert(0, '..')
+from fedex.config import FedexConfig
+
+
+
+
+class FedexConfigObjectTests(unittest.TestCase):
+    """
+    These tests verify that the fedex config object is working properly.
+    """
+
+    def test_fedex_config(self):
+        # Need to pass at least key and password
+        with self.assertRaises(TypeError):
+            FedexConfig()
+
+        # Test minimum set of credentials, key and password
+        config = FedexConfig('key', 'password')
+        assert config.key
+        assert config.password
+
+        # Test with all parameters, including overwrite wsdl path
+        config = FedexConfig(key='', password='', account_number=None, meter_number=None,
+                             freight_account_number=None,
+                             integrator_id=None, wsdl_path='/wsdls',
+                             express_region_code=None, use_test_server=False)
+
+        assert config.wsdl_path
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/test_package_movement_service.py b/tests/test_package_movement_service.py
@@ -15,6 +15,7 @@
 CONFIG_OBJ = get_test_config()
 
 
+@unittest.skipIf(not CONFIG_OBJ.account_number, "No credentials provided.")
 class PackageMovementServiceTests(unittest.TestCase):
     """
     These tests verify that the package movement service WSDL is in good shape.
diff --git a/tests/test_rate_service.py b/tests/test_rate_service.py
@@ -15,6 +15,7 @@
 CONFIG_OBJ = get_test_config()
 
 
+@unittest.skipIf(not CONFIG_OBJ.account_number, "No credentials provided.")
 class RateServiceTests(unittest.TestCase):
     """
     These tests verify that the rate service WSDL is in good shape.
diff --git a/tests/test_ship_service.py b/tests/test_ship_service.py
@@ -16,6 +16,7 @@
 CONFIG_OBJ = get_test_config()
 
 
+@unittest.skipIf(not CONFIG_OBJ.account_number, "No credentials provided.")
 class ShipServiceTests(unittest.TestCase):
     """
     These tests verify that the ship service WSDL is in good shape.
@@ -68,6 +69,7 @@ def test_create_delete_shipment(self):
         package1.Weight = package1_weight
         shipment.add_package(package1)
 
+        shipment.send_validation_request()
         shipment.send_request()
 
         assert shipment.response
diff --git a/tests/test_track_service.py b/tests/test_track_service.py
@@ -15,6 +15,7 @@
 CONFIG_OBJ = get_test_config()
 
 
+@unittest.skipIf(not CONFIG_OBJ.account_number, "No credentials provided.")
 class TrackServiceTests(unittest.TestCase):
     """
     These tests verify that the shipping service WSDL is in good shape.
