Fix can't get the mic version correctly issue.

  * Mic version can't be got because the mic notification is added before version.

Change-Id: I726942f6e496bce42371e3f603c53946afc02854
Signed-off-by: wanchao-xu <wanchao.xu@samsung.com>

diff --git a/cases/create/func_cases/mic_cr_auto_fs.case b/cases/create/func_cases/mic_cr_auto_fs.case
index be2446912de0756e5bb2a75af72e94da746f74ae..432fdcb51250cc6e3e2371d5b425c8691878254d 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_fs.case
+++ b/cases/create/func_cases/mic_cr_auto_fs.case
@@ -35,7 +35,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     exit 1
 fi
 fs_dir=$(ls mic-output/ | grep 'handset_blackbay_fs-.*-rs.tar.gz')
-mic_version=$(mic --version  2>&1 | awk -F ' ' '{print $2}')
+mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
 python parse_manifest.py $fs_dir $mic_version
 
 ]]>

diff --git a/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case b/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case
index 7c952b34b0146c8d4c11dcf8b54346389e3602d2..64c3694371a939584c5ef94fa3251eb763b007f3 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case
+++ b/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case
@@ -12,11 +12,11 @@
 import sys
 import json
 img_file = sys.argv[1]
-#mic_version = sys.argv[2]
+mic_version = sys.argv[2]
 manifest_file=open('mic-output/manifest.json')
 manifest=json.load(manifest_file)
 assert manifest['format'] == 'fs'
-#assert manifest['version'] == mic_version
+assert manifest['version'] == mic_version
 assert manifest['fs']['pack'] == '.tar.gz'
 assert img_file in manifest['fs']['image_files']
       </content>
@@ -35,7 +35,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     exit 1
 fi
 fs_dir=$(ls mic-output/ | grep 'handset_blackbay_fs_d_v_i-.*-rs.tar.gz')
-mic_version=$(mic --version | awk '{print $2}')
+mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
 python parse_manifest.py $fs_dir $mic_version
 
 ]]>

diff --git a/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case b/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case
index d4ac8c4c5f99ee1dc63cedd64e889b40443feafd..2a15a095038dc717d2ca6da97083de702bf22221 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case
+++ b/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case
@@ -34,7 +34,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     exit 1
 fi
 fs_dir=$(ls mic-output/ | grep 'handset_blackbay_fs-.*-rs.tar.gz')
-mic_version=$(mic --version  2>&1 | awk -F ' ' '{print $2}')
+mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
 python parse_manifest.py $fs_dir $mic_version
 
 ]]>

diff --git a/cases/create/func_cases/mic_cr_auto_raw.case b/cases/create/func_cases/mic_cr_auto_raw.case
index 10595f13bc525f97ddd141c7b048175c0e55645d..238495bdde4ad5c7ed4db83a1fe47c7f582009d3 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_raw.case
+++ b/cases/create/func_cases/mic_cr_auto_raw.case
@@ -87,7 +87,7 @@ else
                         sudo mount /dev/mapper/$second_part  mic-output/ivi_dir/ -t ext4
                         #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
                         #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
-                        mic_version=$(mic --version  2>&1 | awk -F ' ' '{print $2}')
+                        mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
                         python parse_manifest.py $bz2img $mic_version $bmap
                         exit 0
                     else

diff --git a/cases/create/mixed_cases/mic_cr_loop_full_ks.case b/cases/create/mixed_cases/mic_cr_loop_full_ks.case
index 65ef3eac05fd9ab51cbd0111490288450bedba38..928d85624c986823f3d7fabdf450a5616dba45d8 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_loop_full_ks.case
+++ b/cases/create/mixed_cases/mic_cr_loop_full_ks.case
@@ -43,7 +43,7 @@ sudo test -f mic-output/s5p4418-artik530-raptor-rev03.dtb
 end_preinstall_line=$(grep 'Preinstall' -n log.file | sed -n '$p' | awk -F ':' '{print $1}')
 start_install_line=$(grep 'Install' -n log.file  | sed -n '2p' | awk -F ':' '{print $1}')
 test $start_install_line -gt $end_preinstall_line
-mic_version=$(mic --version  2>&1 | awk -F ' ' '{print $2}')
+mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
 sudo python parse_manifest.py $img_file $mic_version
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)