tests and lint passing

jacalata · jacalata · commit f89b1d562d94 · 2019-11-25T11:53:42.000-08:00
diff --git a/contributing.md b/contributing.md
@@ -59,4 +59,8 @@ somewhere.
 > pip install versioneer
 > python setup.py build
 > python setup.py test
-> 
+>
+
+### before committing
+Our CI runs include a python lint run, so you should run this locally and fix complaints before committing as this will fail your checkin
+> pycodestyle tableauserverclient test samples
diff --git a/samples/explore_webhooks.py b/samples/explore_webhooks.py
@@ -30,8 +30,6 @@ def main():
                         help='desired logging level (set to error by default)')
 
     args = parser.parse_args()
-
-
     if args.p is None:
         password = getpass.getpass("Password: ")
     else:
@@ -80,6 +78,5 @@ def main():
                 server.webhooks.delete(sample_webhook.id)
 
 
-
 if __name__ == '__main__':
     main()
diff --git a/tableauserverclient/server/endpoint/webhooks_endpoint.py b/tableauserverclient/server/endpoint/webhooks_endpoint.py
@@ -61,4 +61,3 @@ def test(self, webhook_id):
         testOutcome = self.get_request(url)
         logger.info('Testing webhook (ID: {0} returned {1})'.format(webhook_id, testOutcome))
         return testOutcome
-
diff --git a/test/test_webhook.py b/test/test_webhook.py
@@ -77,6 +77,7 @@ def test_request_factory(self):
         webhook_item = WebhookItem()
         webhook_item._set_values("webhook-id", "webhook-name", "url", "api-event-name",
                                  None)
-        webhook_request_actual = '{}\r\n'.format(RequestFactory.Webhook.create_req(webhook_item).decode('utf-8'))
+        webhook_request_actual = '{}\n'.format(RequestFactory.Webhook.create_req(webhook_item).decode('utf-8'))
         self.maxDiff = None
-        self.assertEqual(webhook_request_expected, webhook_request_actual)
+        # windows does /r/n for linebreaks, remove the extra char if it is there
+        self.assertEqual(webhook_request_expected.replace('\r', ''), webhook_request_actual)
