From d4020f0bce8c7841879736cd00ec64d617111c80 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Thu, 23 Apr 2020 14:14:02 +0200
Subject: Modified nand memory flasher

---
 test-cli/.idea/workspace.xml          |   6 +++---
 test-cli/test/__init__.pyc            | Bin 114 -> 124 bytes
 test-cli/test/flashers/flashmemory.py |   4 ++--
 test-cli/test/helpers/__init__.pyc    | Bin 122 -> 132 bytes
 test-cli/test_main.py                 |   7 ++++---
 5 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'test-cli')

diff --git a/test-cli/.idea/workspace.xml b/test-cli/.idea/workspace.xml
index d36015c..2439fd2 100644
--- a/test-cli/.idea/workspace.xml
+++ b/test-cli/.idea/workspace.xml
@@ -3,9 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="4991a6e0-1b9d-4824-9b6e-5ac031eb4816" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/tests/qethernet.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/tests/qethernet.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/tests/qusb.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/tests/qusb.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/tests/qwifi.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/tests/qwifi.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/flashers/flashmemory.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/flashers/flashmemory.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/runners/simple.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/runners/simple.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/test_main.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -30,6 +29,7 @@
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
diff --git a/test-cli/test/__init__.pyc b/test-cli/test/__init__.pyc
index cd50092..3248efc 100644
Binary files a/test-cli/test/__init__.pyc and b/test-cli/test/__init__.pyc differ
diff --git a/test-cli/test/flashers/flashmemory.py b/test-cli/test/flashers/flashmemory.py
index c7267c6..3be56d7 100644
--- a/test-cli/test/flashers/flashmemory.py
+++ b/test-cli/test/flashers/flashmemory.py
@@ -1,9 +1,9 @@
 import sh
 
 
-def flash_memory(imagefile):
+def flash_memory(imagepath):
     print("Start programming Nand memory...")
-    p = sh.bash("/usr/bin/igep-flash", "--skip-nandtest", "--image", "/opt/firmware/" + imagefile)
+    p = sh.bash("/usr/bin/igep-flash", "--skip-nandtest", "--image", imagepath)
     if p.exit_code != 0:
         print("Flasher: Could not complete flashing task.")
         return 1
diff --git a/test-cli/test/helpers/__init__.pyc b/test-cli/test/helpers/__init__.pyc
index 7d1c907..01014e2 100644
Binary files a/test-cli/test/helpers/__init__.pyc and b/test-cli/test/helpers/__init__.pyc differ
diff --git a/test-cli/test_main.py b/test-cli/test_main.py
index 23250ca..3034e77 100644
--- a/test-cli/test_main.py
+++ b/test-cli/test_main.py
@@ -156,10 +156,11 @@ def main():
 
         # flash non-volatile memory
         resultmemory = 0
-        if "image" in varlist and len(varlist["image"]) > 0:
-            resultmemory = flash_memory(varlist["image"])
+        if ("flashimagepath" in varlist and len(varlist["flashimagepath"]) > 0:
+            resultmemory = flash_memory(varlist["flashimagepath"])
             psdbObj.create_task_result(globalVar.taskid_ctl, "FLASHMEMORY",
-                                       "TASK_OK" if resultmemory == 0 else "TASK_FAIL", varlist["image"])
+                                       "TASK_OK" if resultmemory == 0 else "TASK_FAIL", 
+                                       varlist["flashimagepath"])
 
         # update status with the result
         if resulteeprom == 0 and resultmemory == 0:
-- 
cgit v1.1