Merge pull request #18 from VirtualPlanetaryLaboratory/BPCompat

Reinserted calls to multiplanet in tests.
VirtualPlanetaryLaboratory · Sep 27, 2023 · 7785edf · 7785edf
2 parents b5b83b2 + fd1e73c
commit 7785edf
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 30 deletions.
diff --git a/tests/Bigplanet/test_bigplanet.py b/tests/Bigplanet/test_bigplanet.py
@@ -31,11 +31,11 @@ def test_bigplanet():
         subprocess.check_output(["vspace", "vspace.in"], cwd=path)
 
         # Run multi-planet
-        #subprocess.check_output(["multiplanet", "vspace.in", "-bp"], cwd=path)
+        subprocess.check_output(["multiplanet", "vspace.in", "-bp"], cwd=path)
 
-        #file = path / "MP_Bigplanet.bpa"
+        file = path / "MP_Bigplanet.bpa"
 
-        #assert os.path.isfile(file) == True
+        assert os.path.isfile(file) == True
 
 
 if __name__ == "__main__":

diff --git a/tests/Checkpoint/test_checkpoint.py b/tests/Checkpoint/test_checkpoint.py
@@ -30,15 +30,15 @@ def test_checkpoint():
         subprocess.check_output(["vspace", "vspace.in"], cwd=path)
 
         # Run multi-planet
-        # subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
+        subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
 
-        # # Gets list of folders
-        # folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
+        # Gets list of folders
+        folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
 
-        # for i in range(len(folders)):
-        #     os.chdir(folders[i])
-        #     assert os.path.isfile('earth.earth.forward') == True
-        #     os.chdir('../')
+        for i in range(len(folders)):
+            os.chdir(folders[i])
+            assert os.path.isfile('earth.earth.forward') == True
+            os.chdir('../')
 
 if __name__ == "__main__":
     test_checkpoint()
diff --git a/tests/MpStatus/test_mpstatus.py b/tests/MpStatus/test_mpstatus.py
@@ -30,16 +30,16 @@ def test_mpstatus():
         subprocess.check_output(["vspace", "vspace.in"], cwd=path)
 
         # Run multi-planet and mpstatus
-        # subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
-        # subprocess.check_output(["mpstatus", "vspace.in"], cwd=path)
+        subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
+        subprocess.check_output(["mpstatus", "vspace.in"], cwd=path)
 
-        # # Get list of folders
-        # folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
+        # Get list of folders
+        folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
 
-        # for i in range(len(folders)):
-        #     os.chdir(folders[i])
-        #     assert os.path.isfile("earth.earth.forward") == True
-        #     os.chdir("../")
+        for i in range(len(folders)):
+            os.chdir(folders[i])
+            assert os.path.isfile("earth.earth.forward") == True
+            os.chdir("../")
 
 
 if __name__ == "__main__":

diff --git a/tests/Parallel/test_parallel.py b/tests/Parallel/test_parallel.py
@@ -30,14 +30,14 @@ def test_parallel():
         subprocess.check_output(["vspace", "vspace.in"], cwd=path)
 
         # Run multi-planet
-        # subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
+        subprocess.check_output(["multiplanet", "vspace.in"], cwd=path)
 
-        # folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
+        folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
 
-        # for i in range(len(folders)):
-        #     os.chdir(folders[i])
-        #     assert os.path.isfile('earth.earth.forward') == True
-        #     os.chdir('../')
+        for i in range(len(folders)):
+            os.chdir(folders[i])
+            assert os.path.isfile('earth.earth.forward') == True
+            os.chdir('../')
 
 if __name__ == "__main__":
     test_parallel()
diff --git a/tests/Serial/test_serial.py b/tests/Serial/test_serial.py
@@ -23,14 +23,14 @@ def test_serial():
     subprocess.check_output(["vspace", "vspace.in"], cwd=path)
 
     # Run multi-planet
-    # subprocess.check_output(["multiplanet", "vspace.in", "-c", "1"], cwd=path)
+    subprocess.check_output(["multiplanet", "vspace.in", "-c", "1"], cwd=path)
 
-    # folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
+    folders = sorted([f.path for f in os.scandir(dir) if f.is_dir()])
 
-    # for i in range(len(folders)):
-    #     os.chdir(folders[i])
-    #     assert os.path.isfile('earth.earth.forward') == True
-    #     os.chdir('../')
+    for i in range(len(folders)):
+        os.chdir(folders[i])
+        assert os.path.isfile('earth.earth.forward') == True
+        os.chdir('../')
 
 if __name__ == "__main__":
     test_serial()