Updated tests

Author: freddieknets

tests/test_00_version.py

@@ -4,17 +4,44 @@
 ########################################### #
 
 import pytest
-from xboinc import __version__
+import sys
+
+from xboinc import __version__, __xsuite__versions__
 from xboinc.simulation_io import SimVersion
-from xboinc.simulation_io.version import _version_to_int, _int_to_version
+from xboinc.simulation_io.version import _version_to_int, _int_to_version, assert_versions
+
 
 def test_version():
-    assert __version__ == '0.1.3'
+    assert __version__ == '0.1.4'
+
 
 def test_sim_ver():
     simver = SimVersion()
     simver.assert_version()
-    print(_int_to_version(simver.xboinc_version))
-    with pytest.raises(Exception):
+    with pytest.raises(ImportError):
         simver.xboinc_version = _version_to_int('0.0.0')
         simver.assert_version()
+
+
+def test_xsuite_versions():
+    expected_version = {
+        'xobjects' : '0.2.8',
+        'xdeps'    : '0.4.2',
+        'xpart'    : '0.15.3',
+        'xtrack'   : '0.42.0',
+        'xfields'  : '0.13.1',
+        'xcoll'    : '0.2.5',
+    }
+    current_version = {}
+
+    for mod in expected_version.keys():
+        __import__(mod)
+        current_version[mod] = sys.modules[mod].__version__
+        sys.modules[mod].__version__ = expected_version[mod]
+    assert_versions()
+
+    for mod in expected_version.keys():
+        sys.modules[mod].__version__ = '0.0.0'
+        with pytest.raises(ImportError):
+            assert_versions()
+        sys.modules[mod].__version__ = current_version[mod]

tests/test_01_compilation_and_running.py

@@ -21,6 +21,7 @@
 
 
 def test_compilation():
+    xb._skip_xsuite_version_check = True
     source_files = xb.generate_executable_source()
     assert Path(Path.cwd() / "main.c").exists()
     assert Path(Path.cwd() / "sim_config.h").exists()
@@ -31,29 +32,35 @@ def test_compilation():
     assert len(exec_file) == 1
     assert exec_file[0].exists()
     assert os.access(exec_file[0], os.X_OK)
+    xb._skip_xsuite_version_check = False
 
 
-def test_generate_input():
-    # Simulation input
+def _make_input():
     line = xt.Line.from_json(line_file)
     line.build_tracker()
     x_norm = np.linspace(-.5, .5, 50)
     delta = np.linspace(-1.e-5, 1.e-5, 50)
     part = line.build_particles(x_norm=x_norm, delta=delta, nemitt_x=3.5e-6, nemitt_y=3.5e-6)
+    return line, part
+
 
-    # Assemble data structure
+def test_generate_input():
+    xb._skip_xsuite_version_check = True
+    line, part = _make_input()
     xb.SimConfig.build(line=line, particles=part, num_turns=num_turns, checkpoint_every=10,
                         filename='xboinc_input.bin')
-
     input_file = Path.cwd() / "xboinc_input.bin"
     assert input_file.exists()
+    xb._skip_xsuite_version_check = False
 
 
 def test_track():
+    xb._skip_xsuite_version_check = True
     # If no executable is present, make one
     exec_file = list(Path.cwd().glob(f'xboinc_{xb.app_version}-*'))
     if len(exec_file)==0 or not exec_file[0].exists():
-        xb.generate_executable()
+        test_compilation()
+        exec_file = list(Path.cwd().glob(f'xboinc_{xb.app_version}-*'))
     exec_file = exec_file[0]
 
     # If no input file is present, make one
@@ -79,15 +86,24 @@ def test_track():
     assert np.all(part_xboinc.at_turn == num_turns), "Unexpected survivals (particles)"
     assert sim_state.i_turn == num_turns, "Unexpecteds survival (sim_state)"
 
+    # Check that the tracking made sense, i.e. that not all values are the same
+    assert not np.allclose(part_xboinc.x,  part_xboinc.x[0],  rtol=1e-4, atol=0)
+    assert not np.allclose(part_xboinc.px, part_xboinc.px[0], rtol=1e-4, atol=0)
+    assert not np.allclose(part_xboinc.y,  part_xboinc.y[0],  rtol=1e-4, atol=0)
+    assert not np.allclose(part_xboinc.py, part_xboinc.py[0], rtol=1e-4, atol=0)
+
     # Rename file for comparison in next test
     output_file.rename(output_file.parent / f'{output_file.name}_2')
+    xb._skip_xsuite_version_check = False
 
 
 def test_checkpoint():
+    xb._skip_xsuite_version_check = True
     # If no executable is present, make one
     exec_file = list(Path.cwd().glob(f'xboinc_{xb.app_version}-*'))
     if len(exec_file)==0 or not exec_file[0].exists():
-        xb.generate_executable()
+        test_compilation()
+        exec_file = list(Path.cwd().glob(f'xboinc_{xb.app_version}-*'))
     exec_file = exec_file[0]
 
     # If no input file is present, make one
@@ -123,22 +139,20 @@ def test_checkpoint():
     output_file = Path.cwd() / 'sim_state_out.bin'
     assert output_file.exists()
     assert filecmp.cmp(output_file, output_file.parent / f'{output_file.name}_2', shallow=False)
+    xb._skip_xsuite_version_check = False
 
 
 def test_vs_xtrack():
+    xb._skip_xsuite_version_check = True
     # If no output is present, make one
-    output_file = Path.cwd() / 'sim_state_out.bin'
+    output_file = Path.cwd() / 'sim_state_out.bin_2'
     if not output_file.exists():
         test_track()
     sim_state = xb.SimState.from_binary(output_file)
     part_xboinc = sim_state.particles
 
     # Testing results with xtrack
-    line = xt.Line.from_json(line_file)
-    line.build_tracker()
-    x_norm = np.linspace(-.5, .5, 50)
-    delta = np.linspace(-1.e-5, 1.e-5, 50)
-    part = line.build_particles(x_norm=x_norm, delta=delta, nemitt_x=3.5e-6, nemitt_y=3.5e-6)
+    line, part = _make_input()
     line.track(part, num_turns=num_turns)
 
     assert np.array_equal(part.at_turn, part_xboinc.at_turn), "Fail to match xtrack: survivals are not equal"
@@ -148,3 +162,4 @@ def test_vs_xtrack():
     assert np.array_equal(part.px, part_xboinc.px),           "Fail to match xtrack: px are not equal"
     assert np.array_equal(part.py, part_xboinc.py),           "Fail to match xtrack: py are not equal"
     assert np.array_equal(part.delta, part_xboinc.delta),     "Fail to match xtrack: delta are not equal"
+    xb._skip_xsuite_version_check = False

tests/test_02_user.py

@@ -9,10 +9,10 @@
 
 import xboinc as xb
 
+
 user       = 'sixtadm'
 folder_afs = Path('/afs/cern.ch/user/s/sixtadm/public/test_xboinc').resolve()
 folder_eos = Path('/afs/cern.ch/user/s/sixtadm/eos_sixtadm/test_xboinc').resolve()
-
 user_data_file = xb._pkg_root / 'user_data.json'
 
 

tests/test_03_submission_and_retrieval.py

@@ -21,6 +21,7 @@
 
 
 def test_submission():
+    xb._skip_xsuite_version_check = True
     num_turns = 100
     num_particles = 5000
     checkpoint_every = 25
@@ -79,6 +80,7 @@ def test_submission():
     assert np.all([member[:len(user)+2] == f'{user}__' for member in member_names])
     assert len([member for member in member_names if member[-5:]=='.json']) == num_jobs
     assert len([member for member in member_names if member[-4:]=='.bin']) == num_jobs
+    xb._skip_xsuite_version_check = False
 
 
 def test_running():
@@ -127,6 +129,7 @@ def test_running():
 
 
 def test_retrieval():
+    xb._skip_xsuite_version_check = True
     for studyname in ['test_study_1', 'test_study_2']:
         num_jobs = 0
         x_mean_prev = 0
@@ -153,4 +156,5 @@ def test_retrieval():
                 + f"y = {y_mean:.4} +- {y_std:.4}")
 
         assert num_jobs == 5
+    xb._skip_xsuite_version_check = False