diff --git a/modules/pmi/test/test_mmcif.py b/modules/pmi/test/test_mmcif.py index 46e88b4607..31a755fd2c 100644 --- a/modules/pmi/test/test_mmcif.py +++ b/modules/pmi/test/test_mmcif.py @@ -1123,6 +1123,8 @@ def test_ensemble_dumper(self): """Test dumping of simple ensembles""" class DummyPostProcess: pass + class DummyModel: + pass m = IMP.Model() s = IMP.pmi.topology.System(m) po = IMP.pmi.mmcif.ProtocolOutput() @@ -1131,10 +1133,14 @@ class DummyPostProcess: pp = DummyPostProcess() pp._id = 99 - po._add_simple_ensemble(pp, 'Ensemble 1', 5, 0.1, 1, - {}, None) - po._add_simple_ensemble(pp, 'Ensemble 2', 5, 0.1, 1, - {}, None) + e = po._add_simple_ensemble(pp, 'Ensemble 1', 5, 0.1, 1, + {}, None) + # Work around python-ihm 1.7 not handling IDs of empty model + # groups properly + e.model_group.append(DummyModel()) + e = po._add_simple_ensemble(pp, 'Ensemble 2', 5, 0.1, 1, + {}, None) + e.model_group.append(DummyModel()) loc = ihm.location.InputFileLocation(repo='foo', path='bar') po.set_ensemble_file(1, loc) loc._id = 42 @@ -1801,11 +1807,13 @@ class DummyProtocolStep: _ihm_3dem_restraint.fitting_method _ihm_3dem_restraint.fitting_method_citation_id _ihm_3dem_restraint.struct_assembly_id +_ihm_3dem_restraint.map_segment_flag _ihm_3dem_restraint.number_of_gaussians _ihm_3dem_restraint.model_id _ihm_3dem_restraint.cross_correlation_coefficient -1 4 'Gaussian mixture models' . 2 2 5 0.100 -2 4 'Gaussian mixture models' . 2 2 9 0.200 +_ihm_3dem_restraint.details +1 4 'Gaussian mixture models' . 2 . 2 5 0.100 . +2 4 'Gaussian mixture models' . 2 . 2 9 0.200 . # """)