From 34df86b37d6838b115e65e5f3a332344afeb86b8 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Wed, 1 Jul 2020 10:45:34 +0200
Subject: Changes to adapt to new way to save results in DB. Created audio
 test. Added protections against unexpected status in DB.

---
 test-cli/test/tests/qethernet.py | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index 878c0a0..3b2f197 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -1,6 +1,5 @@
 import unittest
 import sh
-import re
 import json
 
 
@@ -53,45 +52,25 @@ class Qethernet(unittest.TestCase):
             data = json.loads(p.stdout.decode('ascii'))
             self.__bwreal = float(data['end']['sum_received']['bits_per_second'])/1024/1024
             # save result file
-            with open('/tmp/ethernet-iperf.json', 'w') as outfile:
+            with open('/tmp/station/ethernet-iperf3.json', 'w') as outfile:
                 json.dump(data, outfile, indent=4)
+            outfile.close()
             self.__resultlist.append(
                 {
-                    "desc": "iperf3 output",
-                    "data": "/tmp/ethernet-iperf.json",
-                    "type": "file"
+                    "description": "iperf3 output",
+                    "filepath": "/tmp/station/ethernet-iperf3.json",
+                    "mimetype": "application/json"
                 }
             )
 
             # check if BW is in the expected range
             if self.__bwreal < float(self.__bwexpected):
-                self.__resultlist.append(
-                    {
-                        "desc": "Test result",
-                        "data": "FAILED: speed is lower than spected. Speed(Mbits/s): " + str(self.__bwreal),
-                        "type": "string"
-                    }
-                )
                 self.fail("failed: speed is lower than spected. Speed(Mbits/s): " + str(self.__bwreal))
         else:
-            self.__resultlist.append(
-                {
-                    "desc": "Test result",
-                    "data": "FAILED: could not complete iperf command.",
-                    "type": "string"
-                }
-            )
             self.fail("failed: could not complete iperf command.")
 
-        # Test successful
-        self.__resultlist.append(
-            {
-                "desc": "Test result",
-                "data": "OK",
-                "type": "string"
-            }
-        )
-
     def getresults(self):
-
         return self.__resultlist
+
+    def gettextresult(self):
+        return ""
-- 
cgit v1.1