[common][tct-fonts-css3-tests][DPTTIZEN-2943, fix one font-matching-rule tc]

Change-Id: Ife03d6b2bc0f6038e55b80dda27610f0e57544ce
Signed-off-by: lin qunfang <qunfang.lin@samsung.com>

diff --git a/common/tct-fonts-css3-tests/fonts/csswg/font-matching-rule-006.htm b/common/tct-fonts-css3-tests/fonts/csswg/font-matching-rule-006.htm
index eeaa5ff5b7dc74539986aa60b342092f6d9121c1..c88fe9a37867b00f0518f86f856a903b5f6e2f6a 100755 (executable)
--- a/common/tct-fonts-css3-tests/fonts/csswg/font-matching-rule-006.htm
+++ b/common/tct-fonts-css3-tests/fonts/csswg/font-matching-rule-006.htm
@@ -9,10 +9,6 @@
         <meta content="ahem" name="flags">
         <meta content="If the font contains definition of 'italic' or 'oblique' and italic or oblique is set by the style, then use that font." name="assert">
         <style type="text/css">
-            @font-face {
-                font-family: Ahem;
-                src: url("support/AHEM____.TTF");
-            }
             div
             {
                 font-family: Ahem;

diff --git a/common/tct-fonts-css3-tests/inst.wgt.py b/common/tct-fonts-css3-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..122ddbf63fd9859b222d5a03900b770e97dc06be 100755 (executable)
--- a/common/tct-fonts-css3-tests/inst.wgt.py
+++ b/common/tct-fonts-css3-tests/inst.wgt.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 import string
-from optparse import OptionParser, make_option\r
+from optparse import OptionParser, make_option
 import ConfigParser
 
 
@@ -20,6 +20,8 @@ tct_parser = ConfigParser.ConfigParser()
 tct_parser.read(TCT_CONFIG_FILE)
 SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')
 PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
+AHEM_FILE = "AHEM____.TTF"
+AHEM_DEST_DIR = "/usr/share/fonts/%s" % AHEM_FILE
 EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')
 ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')
 
@@ -130,6 +132,11 @@ def uninstPKGs():
                         action_status = False
                         break
 
+            if file == "AHEM____.TTF":
+                (return_code, output) = doRemoteCMD("rm -rf %s" % AHEM_DEST_DIR)
+                if return_code != 0:
+                    action_status = False
+
     (return_code, output) = doRemoteCMD(
         "rm -rf %s" % PKG_SRC_DIR)
     if return_code != 0:
@@ -160,6 +167,19 @@ def instPKGs():
                         action_status = False
                         break
 
+            if file == "AHEM____.TTF":
+                (return_code, output) = doRemoteCMD("mount -o remount, rw /")
+                if return_code != 0:
+                    action_status = False
+
+                if not doRemoteCopy(os.path.join(root, file), AHEM_DEST_DIR):
+                    action_status = False
+
+                (return_code, output) = doRemoteCMD("chsmack -a _ %s" % AHEM_DEST_DIR)
+                if return_code != 0:
+                    action_status = False
+
+
     # Do some special copy/delete... steps
     '''
     (return_code, output) = doRemoteCMD(

diff --git a/common/tct-fonts-css3-tests/suite.json b/common/tct-fonts-css3-tests/suite.json
index 5b57bba5ca2641ccd3c25c2b27c38e6de8212677..bca68ee225c11efe9ac94fd8ec358601781e34a7 100755 (executable)
--- a/common/tct-fonts-css3-tests/suite.json
+++ b/common/tct-fonts-css3-tests/suite.json
@@ -32,10 +32,11 @@
             "copylist": {
                 "inst.wgt.py": "inst.py",
                 "tests.full.xml": "tests.full.xml",
-                "tests.xml": "tests.xml"
+                "tests.xml": "tests.xml",
+                "fonts/csswg/support/AHEM____.TTF": "AHEM____.TTF"
             },
-            "pkg-app": {\r
-                "sign-flag": "true"\r
+            "pkg-app": {
+                "sign-flag": "true"
             }
         },
         "xpk": {