Organize skiplist files into a separated folder (#218)

robertsipka · rtakacs · commit 3a133bf84a37 · 2018-09-26T08:38:28.000+02:00
JSRemoteTest-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com
diff --git a/jstest/common/paths.py b/jstest/common/paths.py
@@ -67,6 +67,8 @@
 
 TESTRUNNER_PATH = os.path.join(JSTEST_PATH, 'testrunner')
 
+SKIPLIST_PATH = os.path.join(TESTRUNNER_PATH, 'skiplist')
+
 #
 # ================================
 #
diff --git a/jstest/testrunner/skiplist/__init__.py b/jstest/testrunner/skiplist/__init__.py
@@ -0,0 +1 @@
+# Required for Python to search this directory for module files.
diff --git a/jstest/testrunner/skiplist/iotjs-skiplist.json b/jstest/testrunner/skiplist/iotjs-skiplist.json
diff --git a/jstest/testrunner/skiplist/jerryscript-skiplist.json b/jstest/testrunner/skiplist/jerryscript-skiplist.json
diff --git a/jstest/testrunner/skiplist/skiplist.py b/jstest/testrunner/skiplist/skiplist.py
@@ -85,7 +85,7 @@ def _read_skiplist(self):
            'jerryscript': 'jerryscript-skiplist.json'
         }
 
-        skipfile = utils.join(paths.TESTRUNNER_PATH, skiplists[self.app])
+        skipfile = utils.join(paths.SKIPLIST_PATH, skiplists[self.app])
         skiplist = utils.read_json_file(skipfile)
 
         return skiplist[self.device_type]
diff --git a/jstest/testrunner/testrunner.py b/jstest/testrunner/testrunner.py
@@ -15,7 +15,7 @@
 from jstest.common import paths, reporter, utils
 from jstest.testrunner import utils as testrunner_utils
 from jstest.testrunner import devices
-from jstest.testrunner.skiplist import Skiplist
+from jstest.testrunner.skiplist.skiplist import Skiplist
 
 
 def read_testsets(env):

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@`
`67`	`67`
`68`	`68`	`TESTRUNNER_PATH = os.path.join(JSTEST_PATH, 'testrunner')`
`69`	`69`
	`70`	`+SKIPLIST_PATH = os.path.join(TESTRUNNER_PATH, 'skiplist')`
	`71`	`+`
`70`	`72`	`#`
`71`	`73`	`# ================================`
`72`	`74`	`#`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Required for Python to search this directory for module files.`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ def _read_skiplist(self):`
`85`	`85`	`'jerryscript': 'jerryscript-skiplist.json'`
`86`	`86`	`}`
`87`	`87`
`88`		`- skipfile = utils.join(paths.TESTRUNNER_PATH, skiplists[self.app])`
	`88`	`+ skipfile = utils.join(paths.SKIPLIST_PATH, skiplists[self.app])`
`89`	`89`	`skiplist = utils.read_json_file(skipfile)`
`90`	`90`
`91`	`91`	`return skiplist[self.device_type]`