From: laili Date: Thu, 16 Aug 2018 06:01:21 +0000 (+0800) Subject: Dealing with test related stuffs. X-Git-Tag: 1.2.0~24 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vfc%2Fgvnfm%2Fvnflcm.git;a=commitdiff_plain;h=4e55eea171d9556802ca96410de7a737e568f94d Dealing with test related stuffs. Fix a bug when running util tests on windows platform. Change-Id: I5419dc48b8501cd94d7283f35508b666a110d6e4 Issue-ID: VFC-1012 Signed-off-by: laili --- diff --git a/lcm/lcm/pub/utils/tests.py b/lcm/lcm/pub/utils/tests.py index d7d628e0..87516f07 100644 --- a/lcm/lcm/pub/utils/tests.py +++ b/lcm/lcm/pub/utils/tests.py @@ -20,6 +20,7 @@ import urllib2 import syscomm import timeutil import values +import platform from lcm.pub.database.models import JobStatusModel, JobModel from lcm.pub.utils.jobutil import JobUtil @@ -57,7 +58,10 @@ class UtilsTest(unittest.TestCase): fileutil.delete_dirs("abc") is_ok, f_name = fileutil.download_file_from_http("1", "abc", "1.txt") self.assertTrue(is_ok) - self.assertTrue(f_name.endswith("abc/1.txt")) + if platform.system() == 'Windows': + self.assertTrue(f_name.endswith("abc\\1.txt")) + else: + self.assertTrue(f_name.endswith("abc/1.txt")) fileutil.delete_dirs("abc") def test_query_job_status(self):