Merge ~pwlars/testflinger-cli:timeouts into testflinger-cli:master

[Paul Larson]

Add some better error handling, and also handle timeouts better when trying to communicate with the testflinger server

[Maciej Kisielewski (kissiel)]

Works great! +1

review: Approve

diff --git a/testflinger-cli b/testflinger-cli
index 126332e..a845129 100755
--- a/testflinger-cli
+++ b/testflinger-cli
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3 -u
+#!/usr/bin/env python3
 # Copyright (C) 2017 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
@@ -53,6 +53,9 @@ def status(ctx, job_id):
         elif e.status == 400:
             print('Invalid job id specified. Check the job id to be sure it '
                   'is correct')
+        if e.status == 404:
+            print('Received 404 error from server. Are you sure this '
+                  'is a testflinger server?')
         sys.exit(1)
     print(job_state)
 
@@ -71,10 +74,14 @@ def submit(ctx, filename, quiet):
         if e.status == 400:
             print('The job you submitted contained bad data or bad '
                   'formatting, or did not specify a job_queue.')
+        if e.status == 404:
+            print('Received 404 error from server. Are you sure this '
+                  'is a testflinger server?')
         else:
             # This shouldn't happen, so let's get the full trace
             print('Unexpected error status from testflinger '
                   'server: {}'.format(e.status))
+        sys.exit(1)
     if quiet:
         print(job_id)
     else:
@@ -95,6 +102,9 @@ def results(ctx, job_id):
         elif e.status == 400:
             print('Invalid job id specified. Check the job id to be sure it '
                   'is correct')
+        if e.status == 404:
+            print('Received 404 error from server. Are you sure this '
+                  'is a testflinger server?')
         sys.exit(1)
 
     print(json.dumps(results, sort_keys=True, indent=4))
@@ -115,6 +125,9 @@ def artifacts(ctx, job_id, filename):
         elif e.status == 400:
             print('Invalid job id specified. Check the job id to be sure it '
                   'is correct')
+        if e.status == 404:
+            print('Received 404 error from server. Are you sure this '
+                  'is a testflinger server?')
         sys.exit(1)
     print('Artifacts downloaded to {}'.format(filename))
 
@@ -133,6 +146,9 @@ def poll(ctx, job_id):
         elif e.status == 400:
             print('Invalid job id specified. Check the job id to be sure it '
                   'is correct')
+        if e.status == 404:
+            print('Received 404 error from server. Are you sure this '
+                  'is a testflinger server?')
         sys.exit(1)
     while True:
         output = ''
@@ -143,7 +159,7 @@ def poll(ctx, job_id):
                 # We are still waiting for the job to start
                 pass
         if output:
-            print(output, end='')
+            print(output, end='', flush=True)
         job_state = conn.get_status(job_id)
         if job_state == 'complete':
             break
diff --git a/testflinger_cli/__init__.py b/testflinger_cli/__init__.py
index 842a62d..a5ba9d7 100644
--- a/testflinger_cli/__init__.py
+++ b/testflinger_cli/__init__.py
@@ -16,6 +16,7 @@
 
 import json
 import requests
+import sys
 import urllib.parse
 import yaml
 
@@ -30,7 +31,7 @@ class Client():
     def __init__(self, server):
         self.server = server
 
-    def get(self, uri_frag):
+    def get(self, uri_frag, timeout=5):
         """Submit a GET request to the server
         :param uri_frag:
             endpoint for the GET request
@@ -38,12 +39,19 @@ class Client():
             String containing the response from the server
         """
         uri = urllib.parse.urljoin(self.server, uri_frag)
-        req = requests.get(uri)
+        try:
+            req = requests.get(uri, timeout=timeout)
+        except requests.exceptions.ConnectTimeout as e:
+            print('Timout while trying to communicate with the server.')
+            sys.exit(1)
+        except requests.exceptions.ConnectionError as e:
+            print('Unable to communicate with specified server.')
+            sys.exit(1)
         if req.status_code != 200:
             raise HTTPError(req.status_code)
         return req.text
 
-    def put(self, uri_frag, data):
+    def put(self, uri_frag, data, timeout=5):
         """Submit a POST request to the server
         :param uri_frag:
             endpoint for the POST request
@@ -51,7 +59,14 @@ class Client():
             String containing the response from the server
         """
         uri = urllib.parse.urljoin(self.server, uri_frag)
-        req = requests.post(uri, json=data)
+        try:
+            req = requests.post(uri, json=data, timeout=timeout)
+        except requests.exceptions.ConnectTimeout as e:
+            print('Timout while trying to communicate with the server.')
+            sys.exit(1)
+        except requests.exceptions.ConnectionError as e:
+            print('Unable to communicate with specified server.')
+            sys.exit(1)
         if req.status_code != 200:
             raise HTTPError(req.status_code)
         return req.text
@@ -103,7 +118,7 @@ class Client():
         """
         endpoint = '/v1/result/{}/artifact'.format(job_id)
         uri = urllib.parse.urljoin(self.server, endpoint)
-        req = requests.get(uri)
+        req = requests.get(uri, timeout=5)
         if req.status_code != 200:
             raise HTTPError(req.status_code)
         with open(path, 'wb') as artifact: