Commit 16e95ca5 authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

test

parent 97c55956
......@@ -1034,18 +1034,19 @@ class MCIsimulator():
#data_time=now.strftime("%Y-%m-%d-%H-%M-%S")
result_day=now.strftime("%Y-%m-%d")
if self.information['dir_path'] =='/nfsdata/share/simulation-unittest/mci_sim/':
self.result_path = self.information['dir_path'] +'mci_sim_result/'+result_day
else:
# if self.information['dir_path'] =='/nfsdata/share/simulation-unittest/mci_sim/':
# self.result_path = self.information['dir_path'] +'mci_sim_result/'+result_day
# else:
home_path = os.environ['HOME']
# home_path = os.environ['HOME']
if home_path == '/home/yan':
# if home_path == '/home/yan':
self.result_path = '../MCI_simResult/'+self.source+"_"+result_day
else:
self.result_path = '/data/mcisimdata/'+result_day
# self.result_path = '../MCI_simResult/'+self.source+"_"+result_day
# else:
# self.result_path = '/data/mcisimdata/'+result_day
self.result_path = self.information['result_path']+self.source+"_"+result_day
if os.path.isdir(self.result_path)==False:
os.mkdir(self.result_path)
......@@ -4908,7 +4909,7 @@ class MCIsimulator():
################################################################################################
def runMCIsim(sourcein,configfile,dir_path, debug, iLoop):
def runMCIsim(sourcein,configfile,dir_path, result_path, debug, iLoop):
print('Path Test:dir_path', dir_path)
......@@ -4920,6 +4921,7 @@ def runMCIsim(sourcein,configfile,dir_path, debug, iLoop):
sim[iLoop].information['sourcein'] =sourcein
sim[iLoop].information['debug'] =debug
sim[iLoop].information['result_path'] =result_path
sim[iLoop].simulate(iLoop)
......
......@@ -49,7 +49,9 @@ class TestDemoFunction(unittest.TestCase):
debug=True
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, debug, 1)
result_path = dir_path +'mci_sim_result/'
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, result_path, debug, 1)
self.assertEqual(
1 , 1,
......@@ -89,7 +91,9 @@ class TestDemoFunction(unittest.TestCase):
debug=True
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, debug, 1)
result_path = dir_path +'mci_sim_result/'
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, result_path, debug, 1)
self.assertEqual(
1 , 1,
......@@ -130,7 +134,9 @@ class TestDemoFunction(unittest.TestCase):
debug=True
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, debug, 1)
result_path = dir_path +'mci_sim_result/'
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, result_path, debug, 1)
self.assertEqual(
1 , 1,
......@@ -170,7 +176,9 @@ class TestDemoFunction(unittest.TestCase):
debug=True
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, debug, 1)
result_path = dir_path +'mci_sim_result/'
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, result_path, debug, 1)
self.assertEqual(
1 , 1,
......@@ -210,7 +218,9 @@ class TestDemoFunction(unittest.TestCase):
debug=True
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, debug, 1)
result_path = dir_path +'mci_sim_result/'
csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, result_path, debug, 1)
self.assertEqual(
1 , 1,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment