alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: harden tests for handling universal line endings

Browse Source 
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu 2017-06-12 20:38:10 -07:00
parent 874eacf12e
commit 0cb7d3f9b4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/check_autoloadlibrary.py
View File

@ -29,7 +29,7 @@ class AutoLoadLibrary(u.TestCase):
moduleName = fileName[:-2] moduleName = fileName[:-2]
snippet = prefix + moduleName + suffix snippet = prefix + moduleName + suffix
with open(os.path.join(subdir, fileName), "r") as f: with open(os.path.join(subdir, fileName), "rU") as f:
#read in entire file #read in entire file
data = f.read() data = f.read()
#Make sure it is module #Make sure it is module

6
tests/check_consistency.py
View File

@ -14,7 +14,7 @@ class BlacklistConsistency(u.TestCase):
def test_java_blacklist(self): def test_java_blacklist(self):
with open(javaBlacklistFile) as f: with open(javaBlacklistFile) as f:
blacklist = [line.rstrip('\n') for line in f] blacklist = [line.rstrip('\r\n') for line in f]
for libraryName in blacklist: for libraryName in blacklist:
files = os.listdir( os.path.join(rootDir, libraryName)) files = os.listdir( os.path.join(rootDir, libraryName))
@ -29,7 +29,7 @@ class BlacklistConsistency(u.TestCase):
def test_python_blacklist(self): def test_python_blacklist(self):
with open(pythonBlacklistFile) as f: with open(pythonBlacklistFile) as f:
blacklist = [line.rstrip('\n') for line in f] blacklist = [line.rstrip('\r\n') for line in f]
for libraryName in blacklist: for libraryName in blacklist:
files = os.listdir( os.path.join(rootDir, libraryName)) files = os.listdir( os.path.join(rootDir, libraryName))
@ -44,7 +44,7 @@ class BlacklistConsistency(u.TestCase):
def test_node_blacklist(self): def test_node_blacklist(self):
with open(nodeBlacklistFile) as f: with open(nodeBlacklistFile) as f:
blacklist = [line.rstrip('\n') for line in f] blacklist = [line.rstrip('\r\n') for line in f]
for libraryName in blacklist: for libraryName in blacklist:
files = os.listdir( os.path.join(rootDir, libraryName)) files = os.listdir( os.path.join(rootDir, libraryName))