correct server path for testing when docker runs on windows (#192)

Author: zhangzhanqun

tests/test_dynabase.py

@@ -26,7 +26,7 @@ def comparefile(outputf, standardf):
     return True
 
 
-def test_dynabase(base_initialfile, resolve_server_path, resolve_standard_path,resolve_output_path):
+def test_dynabase(base_initialfile, resolve_standard_path,resolve_output_path):
     solution = DynaSolution("localhost")
     fns = []
     fns.append(base_initialfile)
@@ -62,7 +62,8 @@ def test_dynabase(base_initialfile, resolve_server_path, resolve_standard_path,r
     )
     dbase.create_control_contact(rwpnal=1.0, ignore=1, igactc=0)
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_base.k")
+    #serveroutfile = os.path.join(outpath,"test_base.k")
+    serveroutfile = '/'.join((outpath,"test_base.k"))
     outputfile = os.path.join(resolve_output_path, "test_base.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path, "base.k")

tests/test_dynadem.py

@@ -28,7 +28,8 @@ def test_dem(dem_initialfile, resolve_server_path, resolve_standard_path,resolve
     solution.add(dem)
     dem.set_des(ndamp=0.99, tdamp=0.99, frics=0.9, fricr=0.9)
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_dem.k")
+    #serveroutfile = os.path.join(outpath,"test_dem.k")
+    serveroutfile = '/'.join((outpath,"test_dem.k"))
     outputfile = os.path.join(resolve_output_path, "test_dem.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path, "dem.k")

tests/test_dynaem.py

@@ -77,7 +77,8 @@ def test_em_railgun(resolve_em_path, resolve_server_path, resolve_standard_path,
     em.create_em_output(mats=2, matf=2, sols=2, solf=2)
     em.create_em_database_globalenergy(outlv=1)
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_railgun.k")
+    #serveroutfile = os.path.join(outpath,"test_railgun.k")
+    serveroutfile = '/'.join((outpath,"test_railgun.k"))
     outputfile = os.path.join(resolve_output_path, "test_railgun.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path,"em", "railgun.k")
@@ -130,7 +131,8 @@ def test_em_resistive_heating(resolve_em_path, resolve_server_path, resolve_stan
     emobj.set_init_temperature(temp=25)
     emobj.create_em_output(mats=2, matf=2, sols=2, solf=2)
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_resistive_heating.k")
+    #serveroutfile = os.path.join(outpath,"test_resistive_heating.k")
+    serveroutfile = '/'.join((outpath,"test_resistive_heating.k"))
     outputfile = os.path.join(resolve_output_path, "test_resistive_heating.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path,"em", "resistive_heating.k")
@@ -177,7 +179,8 @@ def test_em_resistive_heating_2d(resolve_em_path, resolve_server_path, resolve_s
     emobj.create_em_output(mats=2, matf=2, sols=2, solf=2)
 
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_resistive_heating_2d.k")
+    #serveroutfile = os.path.join(outpath,"test_resistive_heating_2d.k")
+    serveroutfile = '/'.join((outpath,"test_resistive_heating_2d.k"))
     outputfile = os.path.join(resolve_output_path, "test_resistive_heating_2d.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path,"em", "resistive_heating_2d.k")
@@ -227,7 +230,8 @@ def test_em_resistive_heating_2d_isopots(resolve_em_path, resolve_server_path, r
     emobj.create_em_output(mats=2, matf=2, sols=2, solf=2)
 
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_resistive_heating_2d_isopots.k")
+    #serveroutfile = os.path.join(outpath,"test_resistive_heating_2d_isopots.k")
+    serveroutfile = '/'.join((outpath,"test_resistive_heating_2d_isopots.k"))
     outputfile = os.path.join(resolve_output_path, "test_resistive_heating_2d_isopots.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path,"em", "resistive_heating_2d_isopots.k")
@@ -269,7 +273,8 @@ def test_em_rlc_isopotential(resolve_em_path, resolve_server_path, resolve_stand
     emobj.create_em_output(mats=2, matf=2, sols=2, solf=2)
 
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_rlc_isopotential.k")
+    #serveroutfile = os.path.join(outpath,"test_rlc_isopotential.k")
+    serveroutfile = '/'.join((outpath,"test_rlc_isopotential.k"))
     outputfile = os.path.join(resolve_output_path, "test_rlc_isopotential.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path,"em", "rlc_isopotential.k")
@@ -323,7 +328,8 @@ def test_em_rlc_define_func(resolve_em_path, resolve_server_path, resolve_standa
     emobj.create_em_output(mats=2, matf=2, sols=2, solf=2)
 
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_rlc_define_func.k")
+    #serveroutfile = os.path.join(outpath,"test_rlc_define_func.k")
+    serveroutfile = '/'.join((outpath,"test_rlc_define_func.k"))
     outputfile = os.path.join(resolve_output_path, "test_rlc_define_func.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path,"em", "rlc_define_func.k")
@@ -377,7 +383,8 @@ def test_em_resistive_heating_2d_multi_isopots(resolve_em_path, resolve_server_p
     emobj.create_em_output(mats=2, matf=2, sols=2, solf=2)
 
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_resistive_heating_2d_multi_isopots.k")
+    #serveroutfile = os.path.join(outpath,"test_resistive_heating_2d_multi_isopots.k")
+    serveroutfile = '/'.join((outpath,"test_resistive_heating_2d_multi_isopots.k"))
     outputfile = os.path.join(resolve_output_path, "test_resistive_heating_2d_multi_isopots.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path,"em", "resistive_heating_2d_multi_isopots.k")

tests/test_dynaicfd.py

@@ -50,7 +50,8 @@ def comparefile(outputf, standardf):
 
 def check(solution,server_output_path,resolve_output_path,resolve_standard_path,filename):
     testfilename = "test_" + filename
-    serveroutfile = os.path.join(server_output_path,testfilename)
+    #serveroutfile = os.path.join(server_output_path,testfilename)
+    serveroutfile = '/'.join((server_output_path,testfilename))
     outputfile = os.path.join(resolve_output_path, testfilename)
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path, filename)

tests/test_dynaiga.py

@@ -41,7 +41,8 @@ def test_iga(iga_initialfile, resolve_output_path, resolve_standard_path):
     cylinder3.set_motion(Curve(x=[0, 100], y=[20, 20]), dir=Direction(0, 1, 0))
     iga.add(cylinder3)
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_iga.k")
+    #serveroutfile = os.path.join(outpath,"test_iga.k")
+    serveroutfile = '/'.join((outpath,"test_iga.k"))
     outputfile = os.path.join(resolve_output_path, "test_iga.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path, "iga.k")

tests/test_dynaisph.py

@@ -131,7 +131,8 @@ def test_isph(isph_initialfile, resolve_output_path, resolve_standard_path):
     solution.set_output_database(glstat=0.001, sphmassflow=0.001)
     solution.create_database_binary(dt=0.01)
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_isph.k")
+    #serveroutfile = os.path.join(outpath,"test_isph.k")
+    serveroutfile = '/'.join((outpath,"test_isph.k"))
     outputfile = os.path.join(resolve_output_path, "test_isph.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path, "isph.k")

tests/test_dynamech.py

@@ -64,7 +64,8 @@ def test_mech(mech_initialfile, resolve_output_path, resolve_standard_path):
     )
     solution.create_database_binary(dt=5e-4, ieverp=1)
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_mech.k")
+    #serveroutfile = os.path.join(outpath,"test_mech.k")
+    serveroutfile = '/'.join((outpath,"test_mech.k"))
     outputfile = os.path.join(resolve_output_path, "test_mech.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path, "mech.k")

tests/test_dynanvh.py

@@ -78,7 +78,8 @@ def test_nvh_frf_plate_damping(resolve_nvh_path, resolve_output_path, resolve_st
     nvhobj.parts.add(boxshell)
 
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_frf_plate_damping.k")
+    #serveroutfile = os.path.join(outpath,"test_frf_plate_damping.k")
+    serveroutfile = '/'.join((outpath,"test_frf_plate_damping.k"))
     outputfile = os.path.join(resolve_output_path, "test_frf_plate_damping.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path, "nvh", "frf_plate_damping.k")
@@ -145,7 +146,8 @@ def test_nvh_frf_solid(resolve_nvh_path, resolve_output_path, resolve_standard_p
         matsum=0.1,
     )
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_frf_solid.k")
+    #serveroutfile = os.path.join(outpath,"test_frf_solid.k")
+    serveroutfile = '/'.join((outpath,"test_frf_solid.k"))
     outputfile = os.path.join(resolve_output_path, "test_frf_solid.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path, "nvh", "frf_solid.k")

tests/test_dynasale.py

@@ -80,7 +80,8 @@ def test_sale(sale_initialfile, resolve_output_path, resolve_standard_path):
     sale.add(mesh)
     solution.set_output_database(matsum=0.2, glstat=0.2)
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_sale.k")
+    #serveroutfile = os.path.join(outpath,"test_sale.k")
+    serveroutfile = '/'.join((outpath,"test_sale.k"))
     outputfile = os.path.join(resolve_output_path, "test_sale.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path, "sale.k")

tests/test_dynasolution.py

@@ -34,7 +34,8 @@ def test_solution(resolve_solution_path, resolve_server_path, resolve_standard_p
     )
     solution.create_database_binary(dt=5e-4, ieverp=1)
     outpath = solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_solution.k")
+    #serveroutfile = os.path.join(outpath,"test_solution.k")
+    serveroutfile = '/'.join((outpath,"test_solution.k"))
     outputfile = os.path.join(resolve_output_path, "test_solution.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path,"solution", "solution.k")
@@ -56,7 +57,8 @@ def test_elementary_transform(resolve_solution_path, resolve_server_path, resolv
         )
 
     outpath=solution.save_file()
-    serveroutfile = os.path.join(outpath,"test_elementary_main.k")
+    #serveroutfile = os.path.join(outpath,"test_elementary_main.k")
+    serveroutfile = '/'.join((outpath,"test_elementary_main.k"))
     outputfile = os.path.join(resolve_output_path, "test_elementary_main.k")
     solution.download(serveroutfile,outputfile)
     standardfile = os.path.join(resolve_standard_path,"solution", "elementary_main.k")