[CI] Update pytest and google tests

test/clib/test_clib.cpp

@@ -230,9 +230,11 @@ int main(int argc, char** argv)
     printf("Running main() from test_clib.cpp\n");
     testing::InitGoogleTest(&argc, argv);
     make_deprecation_warnings_fatal();
-    string fileName = "gtest-freeflame.h5";
-    if (std::ifstream(fileName).good()) {
-        std::remove(fileName.c_str());
+    vector<string> fileNames = {"gtest-freeflame.yaml", "gtest-freeflame.h5"};
+    for (const auto& fileName : fileNames) {
+        if (std::ifstream(fileName).good()) {
+            std::remove(fileName.c_str());
+        }
     }
     int result = RUN_ALL_TESTS();
     appdelete();

test/general/test_serialization.cpp

@@ -417,12 +417,12 @@ TEST(Storage, groups)
     // create group implicitly if permissive flag is set
     EXPECT_FALSE(file->hasGroup("one"));
     EXPECT_THROW(file->checkGroup("one"), CanteraError);
-    EXPECT_TRUE(file->checkGroup("one", true));
+    EXPECT_FALSE(file->checkGroup("one", true));
     EXPECT_TRUE(file->hasGroup("one"));
 
     // nested groups
     EXPECT_FALSE(file->hasGroup("one/two"));
-    EXPECT_TRUE(file->checkGroup("one/two", true));
+    EXPECT_FALSE(file->checkGroup("one/two", true));
     EXPECT_TRUE(file->hasGroup("one/two"));
     EXPECT_FALSE(file->hasGroup("two"));
 

test/oneD/test_oneD.cpp

@@ -87,9 +87,9 @@ TEST(onedim, freeflame)
     bool refine_grid = false;
     int loglevel = 0;
     flame.solve(loglevel, refine_grid);
-    flame.save("gtest-freeflame.yaml", "cpp", "Solution from C++ interface", 1);
+    flame.save("gtest-freeflame.yaml", "cpp", "Solution from C++ interface", true);
     if (usesHDF5()) {
-        flame.save("gtest-freeflame.h5", "cpp", "Solution from C++ interface", 1);
+        flame.save("gtest-freeflame.h5", "cpp", "Solution from C++ interface", true);
     }
 
     ASSERT_EQ(flow->nPoints(), nz + 1);
@@ -108,10 +108,6 @@ int main(int argc, char** argv)
     printf("Running main() from test_oneD.cpp\n");
     testing::InitGoogleTest(&argc, argv);
     make_deprecation_warnings_fatal();
-    string fileName = "gtest-freeflame.h5";
-    if (std::ifstream(fileName).good()) {
-        std::remove(fileName.c_str());
-    }
     int result = RUN_ALL_TESTS();
     appdelete();
     return result;

test/python/test_onedim.py

@@ -349,7 +349,7 @@ def run_restart(self, mode):
             if mode == "csv":
                 self.sim.write_csv(data)
             else:
-                self.sim.save(data, group, loglevel=0)
+                self.sim.save(data, group)
 
         reactants = {'H2': 0.9, 'O2': 0.5, 'AR': 2}
         self.create_sim(1.1 * ct.one_atm, 500, reactants, 2.0)
@@ -600,16 +600,16 @@ def run_fixed_restore(self, mode):
         V1 = self.sim.spread_rate
         P1 = self.sim.P
         T1 = self.sim.T
-        self.sim.save(filename, "test", loglevel=0)
+        self.sim.save(filename, "test")
 
         # Save a second solution to the same file
         self.sim.radiation_enabled = True
         self.sim.boundary_emissivities = 0.3, 0.8
-        self.sim.save(filename, "test2", loglevel=0)
+        self.sim.save(filename, "test2")
 
         # Create flame object with dummy initial grid
         self.sim = ct.FreeFlame(self.gas)
-        self.sim.restore(filename, "test", loglevel=0)
+        self.sim.restore(filename, "test")
 
         # Sim is initially in "steady-state" mode, so this returns the
         # steady-state tolerances
@@ -647,7 +647,7 @@ def run_fixed_restore(self, mode):
         self.assertFalse(self.sim.radiation_enabled)
         self.assertFalse(self.sim.soret_enabled)
 
-        self.sim.restore(filename, "test2", loglevel=0)
+        self.sim.restore(filename, "test2")
         self.assertTrue(self.sim.radiation_enabled)
         self.assertEqual(self.sim.boundary_emissivities, (0.3, 0.8))
 
@@ -703,13 +703,13 @@ def test_save_restore_add_species_yaml(self):
         self.solve_mix(ratio=5, slope=0.5, curve=0.3)
         self.sim.transport_model = "multicomponent"
         self.sim.soret_enabled = True
-        self.sim.save(filename, "test", loglevel=0)
+        self.sim.save(filename, "test")
         T1 = self.sim.T
         Y1 = self.sim.Y
 
         gas2 = ct.Solution("h2o2-plus.yaml", transport_model="multicomponent")
         self.sim = ct.FreeFlame(gas2)
-        self.sim.restore(filename, "test", loglevel=0)
+        self.sim.restore(filename, "test")
         T2 = self.sim.T
         Y2 = self.sim.Y
 
@@ -735,13 +735,13 @@ def test_save_restore_remove_species_yaml(self):
         gas1 = self.gas
         self.solve_fixed_T()
         self.solve_mix(ratio=5, slope=0.5, curve=0.3)
-        self.sim.save(filename, "test", loglevel=0)
+        self.sim.save(filename, "test")
         T1 = self.sim.T
         Y1 = self.sim.Y
 
         gas2 = ct.Solution("h2o2.yaml")
         self.sim = ct.FreeFlame(gas2)
-        self.sim.restore(filename, "test", loglevel=0)
+        self.sim.restore(filename, "test")
         T2 = self.sim.T
         Y2 = self.sim.Y
 
@@ -811,10 +811,10 @@ def run_save_restore(self, mode):
 
         self.run_mix(phi=1.1, T=350, width=2.0, p=2.0, refine=False)
         desc = 'mixture-averaged simulation'
-        self.sim.save(filename, "group0", description=desc, loglevel=0)
+        self.sim.save(filename, "group0", description=desc)
 
         f = ct.FreeFlame(self.gas)
-        meta = f.restore(filename, "group0", loglevel=0)
+        meta = f.restore(filename, "group0")
         assert meta['description'] == desc
         assert meta['cantera-version'] == ct.__version__
         assert meta['git-commit'] == f"'{ct.__git_commit__}'"
@@ -840,7 +840,7 @@ def test_deprecated_write_read_hdf(self):
                 # DeprecationWarning is triggered before IOError is raised
                 f.read_hdf(filename, group="group0")
 
-        meta = f.restore(filename, "group0", loglevel=0)
+        meta = f.restore(filename, "group0")
         assert meta['description'] == desc
         assert meta['generator'] == "Cantera SolutionArray"
         assert meta['cantera-version'] == ct.__version__
@@ -1445,11 +1445,11 @@ def run_save_restore(self, mode):
         filename.unlink(missing_ok=True)
 
         self.run_reacting_surface(xch4=0.095, tsurf=900.0, mdot=0.06, width=0.1)
-        self.sim.save(filename, "test", loglevel=0)
+        self.sim.save(filename, "test")
 
         comp = {'CH4': 0.095, 'O2':0.21, 'N2':0.79}
         jet = self.create_reacting_surface(comp, 700.0, 500., width=0.2)
-        jet.restore(filename, "test", loglevel=0)
+        jet.restore(filename, "test")
 
         self.check_save_restore(jet)
 
@@ -1522,7 +1522,7 @@ def run_save_restore(self, mode):
         filename.unlink(missing_ok=True)
 
         sim = self.solve(phi=0.4, T=300, width=0.05, P=0.1)
-        sim.save(filename, loglevel=0, compression=7)
+        sim.save(filename, compression=7)
 
         gas = ct.Solution("h2o2.yaml")
         sim2 = ct.CounterflowTwinPremixedFlame(gas=gas)