From c5b0bdec65a9dd19cecb4b5e14ebed49226e12a8 Mon Sep 17 00:00:00 2001
From: Thorrak <thorrak@excelinspace.com>
Date: Fri, 10 Apr 2020 16:33:10 -0400
Subject: [PATCH] Add check for packaging

---
 .../templates/gravity/gravity_tilt_test.html  | 51 +++++++++++--------
 gravity/tilt/tilt_tests.py                    | 14 ++++-
 gravity/views_tilt.py                         |  4 +-
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/gravity/templates/gravity/gravity_tilt_test.html b/gravity/templates/gravity/gravity_tilt_test.html
index 3a3aface..394900ab 100644
--- a/gravity/templates/gravity/gravity_tilt_test.html
+++ b/gravity/templates/gravity/gravity_tilt_test.html
@@ -61,31 +61,40 @@ <h3>Python Packages</h3>
     <b>Note - </b> The package list being tested below does not apply to installations on Windows.
     </p>
 
-    {% if has_python_packages %}
-        <h4>All necessary python packages are installed</h4>
-    {% else %}
-        <h4 style="color: darkred">Several python packages are missing. </h4>
-    {% endif %}{# has_python_packages #}
+    {% if has_packaging %}
 
+        {% if has_python_packages %}
+            <h4>All necessary python packages are installed</h4>
+        {% else %}
+            <h4 style="color: darkred">Several python packages are missing. </h4>
+        {% endif %}{# has_python_packages #}
 
-    <table class="table table-hover">
-        <tr>
-            <td>Package Name</td>
-            <td>Required Version</td>
-            <td>Installed Version</td>
-            <td>OK?</td>
-        </tr>
 
-        {% for test_result in python_test_results %}
-        <tr>
-            <td>{{ test_result.package }}</td>
-            <td>{{ test_result.required_version }}</td>
-            <td>{{ test_result.installed_version }}</td>
-            <td>{% if test_result.ok %}OK{% else %}Not OK{% endif %}</td>
-        </tr>
-        {% endfor %}
-    </table>
+        <table class="table table-hover">
+            <tr>
+                <td>Package Name</td>
+                <td>Required Version</td>
+                <td>Installed Version</td>
+                <td>OK?</td>
+            </tr>
+
+            {% for test_result in python_test_results %}
+            <tr>
+                <td>{{ test_result.package }}</td>
+                <td>{{ test_result.required_version }}</td>
+                <td>{{ test_result.installed_version }}</td>
+                <td>{% if test_result.ok %}OK{% else %}Not OK{% endif %}</td>
+            </tr>
+            {% endfor %}
+        </table>
+    {% else %}
+        <h4>Python 'packaging' module is not available - Test cannot run!</h4>
+        <p>
+            This is a fairly serious error, as it implies that your python packages are not being kept up-to-date.
+        Check the <a href="{% url "get_app_log" "text" "upgrade" "stderr" %}">upgrade log</a> to see what is happening.
+        </p>
 
+    {% endif %}
 
     <h3>Redis Connectivity</h3>
 
diff --git a/gravity/tilt/tilt_tests.py b/gravity/tilt/tilt_tests.py
index 6e91f173..5540c396 100644
--- a/gravity/tilt/tilt_tests.py
+++ b/gravity/tilt/tilt_tests.py
@@ -1,6 +1,12 @@
 import os, subprocess, sys
 import pkg_resources
-from packaging import version
+
+try:
+    from packaging import version
+    has_packaging = True
+except:
+    has_packaging = False
+
 
 
 # This function is used ot check if an apt package is installed on Raspbian, Ubuntu, Debian, etc.
@@ -45,7 +51,11 @@ def check_apt_packages() -> (bool, list):
     return all_packages_ok, test_results
 
 
-def check_python_packages() -> (bool, list):
+def check_python_packages() -> (bool, bool, list):
+    # Returns has_packaging, all_packages_ok, test_results[]
+    if not has_packaging:
+        return False, False, []
+
     if sys.platform == "darwin":
         # The MacOS support uses different packages from the support for Linux
         package_list = [
diff --git a/gravity/views_tilt.py b/gravity/views_tilt.py
index a98e4503..56471daa 100644
--- a/gravity/views_tilt.py
+++ b/gravity/views_tilt.py
@@ -514,7 +514,7 @@ def gravity_tilt_test(request):
         apt_test_results = []
 
     # Next, check the python packages
-    has_python_packages, python_test_results = tilt_tests.check_python_packages()
+    has_packaging, has_python_packages, python_test_results = tilt_tests.check_python_packages()
 
     # Then check Redis support
     redis_installed, able_to_connect_to_redis, redis_key_test = gravity_debug.try_redis()
@@ -523,4 +523,4 @@ def gravity_tilt_test(request):
                   context={'has_apt': has_apt, 'has_apt_packages': has_apt_packages, 'apt_test_results': apt_test_results,
                            'has_python_packages': has_python_packages, 'python_test_results': python_test_results,
                            'redis_installed': redis_installed, 'able_to_connect_to_redis': able_to_connect_to_redis,
-                           'redis_key_test': redis_key_test})
+                           'redis_key_test': redis_key_test, 'has_packaging': has_packaging,})