Author: bugman
Date: Wed Aug 12 13:06:51 2009
New Revision: 9276
URL: http://svn.gna.org/viewcvs/relax?rev=9276&view=rev
Log:
Made the structure system tests more compatible with non-Unix operating
systems.
Modified:
1.3/test_suite/system_tests/structure.py
Modified: 1.3/test_suite/system_tests/structure.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/structure.py?rev=9276&r1=9275&r2=9276&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/structure.py (original)
+++ 1.3/test_suite/system_tests/structure.py Wed Aug 12 13:06:51 2009
@@ -51,7 +51,7 @@
"""Load the PDB file using the information in a results file (using
the internal structural object)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the results file.
self.relax.interpreter._Results.read(file='str_internal', dir=path)
@@ -104,17 +104,17 @@
"""Load the PDB file using the information in a results file (using
the internal structural object)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the results file.
- self.relax.interpreter._Results.read(file=path+'/str_internal')
+ self.relax.interpreter._Results.read(file=path+sep+'str_internal')
def test_load_scientific_results(self):
"""Load the PDB file using the information in a results file (using
the Scientific python structural object)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the results file.
self.relax.interpreter._Results.read(file='str_scientific', dir=path)
@@ -130,7 +130,7 @@
mol = cdp.structure.structural_data[0].mol[0]
self.assertEqual(mol.file_name, 'Ap4Aase_res1-12.pdb')
- self.assertEqual(mol.file_path, 'test_suite/shared_data/structures')
+ self.assertEqual(mol.file_path,
'test_suite'+sep+'shared_data'+sep+'structures')
self.assertEqual(mol.file_model, 1)
self.assertEqual(mol.file_mol_num, 1)
@@ -153,7 +153,7 @@
"""Load the '1F35_N_H_molmol.pdb' PDB file (using the internal
structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='1F35_N_H_molmol.pdb',
dir=path, parser='internal')
@@ -185,7 +185,7 @@
"""Load the 'Ap4Aase_res1-12.pdb' PDB file (using the internal
structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='Ap4Aase_res1-12.pdb',
dir=path, parser='internal')
@@ -204,7 +204,7 @@
cdp = pipes.get_pipe()
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='gromacs_phthalic_acid.pdb',
dir=path, parser='internal')
@@ -223,7 +223,7 @@
"""Load the 'tylers_peptide_trunc.pdb' PDB file (using the internal
structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='tylers_peptide_trunc.pdb',
dir=path, parser='internal')
@@ -239,7 +239,7 @@
"""Load the 'lactose_MCMM4_S1_1.pdb' PDB file (using the internal
structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures/lactose'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'+sep+'lactose'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='lactose_MCMM4_S1_1.pdb',
dir=path, parser='internal')
@@ -255,7 +255,7 @@
"""Load the 'lactose_MCMM4_S1_1.pdb' and 'lactose_MCMM4_S1_2.pdb'
PDB files as 2 separate structures (using the internal structural object PDB
reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures/lactose'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'+sep+'lactose'
# Read the PDB twice.
self.relax.interpreter._Structure.read_pdb(file='lactose_MCMM4_S1_1.pdb',
dir=path, parser='internal')
@@ -272,7 +272,7 @@
"""Load the 'lactose_MCMM4_S1_1.pdb' PDB file twice as 2 separate
structures (using the internal structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures/lactose'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'+sep+'lactose'
# Read the PDB twice.
self.relax.interpreter._Structure.read_pdb(file='lactose_MCMM4_S1_1.pdb',
dir=path, parser='internal')
@@ -289,7 +289,7 @@
"""Load a few 'lactose_MCMM4_S1_*.pdb' PDB files as models (using
the internal structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures/lactose'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'+sep+'lactose'
# Files.
files = ['lactose_MCMM4_S1_1.pdb',
@@ -329,7 +329,7 @@
"""Load the 2 models of the 'gromacs_phthalic_acid.pdb' PDB file as
separate molecules of the same model (using the internal structural object
PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB models.
self.relax.interpreter._Structure.read_pdb(file='gromacs_phthalic_acid.pdb',
dir=path, parser='internal', read_model=1, set_model_num=1)
@@ -363,14 +363,14 @@
"""Test the packing of models and molecules using
'gromacs_phthalic_acid.pdb' and 'lactose_MCMM4_S1_*.pdb' (using the internal
structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB models.
self.relax.interpreter._Structure.read_pdb(file='gromacs_phthalic_acid.pdb',
dir=path, parser='internal')
-
self.relax.interpreter._Structure.read_pdb(file='lactose/lactose_MCMM4_S1_1.pdb',
dir=path, parser='internal', set_model_num=1,
set_mol_name='lactose_MCMM4_S1')
-
self.relax.interpreter._Structure.read_pdb(file='lactose/lactose_MCMM4_S1_2.pdb',
dir=path, parser='internal', set_model_num=2,
set_mol_name='lactose_MCMM4_S1')
-
self.relax.interpreter._Structure.read_pdb(file='lactose/lactose_MCMM4_S1_3.pdb',
dir=path, parser='internal', set_model_num=1,
set_mol_name='lactose_MCMM4_S1b')
-
self.relax.interpreter._Structure.read_pdb(file='lactose/lactose_MCMM4_S1_4.pdb',
dir=path, parser='internal', set_model_num=2,
set_mol_name='lactose_MCMM4_S1b')
+
self.relax.interpreter._Structure.read_pdb(file='lactose'+sep+'lactose_MCMM4_S1_1.pdb',
dir=path, parser='internal', set_model_num=1,
set_mol_name='lactose_MCMM4_S1')
+
self.relax.interpreter._Structure.read_pdb(file='lactose'+sep+'lactose_MCMM4_S1_2.pdb',
dir=path, parser='internal', set_model_num=2,
set_mol_name='lactose_MCMM4_S1')
+
self.relax.interpreter._Structure.read_pdb(file='lactose'+sep+'lactose_MCMM4_S1_3.pdb',
dir=path, parser='internal', set_model_num=1,
set_mol_name='lactose_MCMM4_S1b')
+
self.relax.interpreter._Structure.read_pdb(file='lactose'+sep+'lactose_MCMM4_S1_4.pdb',
dir=path, parser='internal', set_model_num=2,
set_mol_name='lactose_MCMM4_S1b')
# Try loading a few protons.
self.relax.interpreter._Structure.load_spins('@*H*')
@@ -407,7 +407,7 @@
"""Load the '1F35_N_H_molmol.pdb' PDB file (using the Scientific
python structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='1F35_N_H_molmol.pdb',
dir=path, parser='scientific')
@@ -434,7 +434,7 @@
"""Load the 'Ap4Aase_res1-12.pdb' PDB file (using the Scientific
python structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='Ap4Aase_res1-12.pdb',
dir=path, parser='scientific')
@@ -453,7 +453,7 @@
cdp = pipes.get_pipe()
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='gromacs_phthalic_acid.pdb',
dir=path, parser='scientific')
@@ -472,7 +472,7 @@
"""Load the 'tylers_peptide_trunc.pdb' PDB file (using the
Scientific python structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='tylers_peptide_trunc.pdb',
dir=path, parser='scientific')
@@ -488,7 +488,7 @@
"""Load the 'lactose_MCMM4_S1_1.pdb' PDB file (using the Scientific
python structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures/lactose'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'+sep+'lactose'
# Read the PDB.
self.relax.interpreter._Structure.read_pdb(file='lactose_MCMM4_S1_1.pdb',
dir=path, parser='scientific')
@@ -504,7 +504,7 @@
"""Load the 'lactose_MCMM4_S1_1.pdb' and 'lactose_MCMM4_S1_2.pdb'
PDB files as 2 separate structures (using the Scientific python structural
object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures/lactose'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'+sep+'lactose'
# Read the PDB twice.
self.relax.interpreter._Structure.read_pdb(file='lactose_MCMM4_S1_1.pdb',
dir=path, parser='scientific')
@@ -521,7 +521,7 @@
"""Load the 'lactose_MCMM4_S1_1.pdb' PDB file twice as 2 separate
structures (using the Scientific python structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures/lactose'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'+sep+'lactose'
# Read the PDB twice.
self.relax.interpreter._Structure.read_pdb(file='lactose_MCMM4_S1_1.pdb',
dir=path, parser='scientific')
@@ -538,7 +538,7 @@
"""Load a few 'lactose_MCMM4_S1_*.pdb' PDB files as models (using
the Scientific python structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures/lactose'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'+sep+'lactose'
# Files.
files = ['lactose_MCMM4_S1_1.pdb',
@@ -578,7 +578,7 @@
"""Load the 2 models of the 'gromacs_phthalic_acid.pdb' PDB file as
separate molecules of the same model (using the Scientific python structural
object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB models.
self.relax.interpreter._Structure.read_pdb(file='gromacs_phthalic_acid.pdb',
dir=path, parser='scientific', read_model=1, set_model_num=1)
@@ -612,14 +612,14 @@
"""Test the packing of models and molecules using
'gromacs_phthalic_acid.pdb' and 'lactose_MCMM4_S1_*.pdb' (using the
Scientific python structural object PDB reader)."""
# Path of the files.
- path = sys.path[-1] + '/test_suite/shared_data/structures'
+ path = sys.path[-1] +
sep+'test_suite'+sep+'shared_data'+sep+'structures'
# Read the PDB models.
self.relax.interpreter._Structure.read_pdb(file='gromacs_phthalic_acid.pdb',
dir=path, parser='scientific')
-
self.relax.interpreter._Structure.read_pdb(file='lactose/lactose_MCMM4_S1_1.pdb',
dir=path, parser='scientific', read_mol=1, set_model_num=1,
set_mol_name='lactose_MCMM4_S1')
-
self.relax.interpreter._Structure.read_pdb(file='lactose/lactose_MCMM4_S1_2.pdb',
dir=path, parser='scientific', read_mol=1, set_model_num=2,
set_mol_name='lactose_MCMM4_S1')
-
self.relax.interpreter._Structure.read_pdb(file='lactose/lactose_MCMM4_S1_3.pdb',
dir=path, parser='scientific', read_mol=1, set_model_num=1,
set_mol_name='lactose_MCMM4_S1b')
-
self.relax.interpreter._Structure.read_pdb(file='lactose/lactose_MCMM4_S1_4.pdb',
dir=path, parser='scientific', read_mol=1, set_model_num=2,
set_mol_name='lactose_MCMM4_S1b')
+
self.relax.interpreter._Structure.read_pdb(file='lactose'+sep+'lactose_MCMM4_S1_1.pdb',
dir=path, parser='scientific', read_mol=1, set_model_num=1,
set_mol_name='lactose_MCMM4_S1')
+
self.relax.interpreter._Structure.read_pdb(file='lactose'+sep+'lactose_MCMM4_S1_2.pdb',
dir=path, parser='scientific', read_mol=1, set_model_num=2,
set_mol_name='lactose_MCMM4_S1')
+
self.relax.interpreter._Structure.read_pdb(file='lactose'+sep+'lactose_MCMM4_S1_3.pdb',
dir=path, parser='scientific', read_mol=1, set_model_num=1,
set_mol_name='lactose_MCMM4_S1b')
+
self.relax.interpreter._Structure.read_pdb(file='lactose'+sep+'lactose_MCMM4_S1_4.pdb',
dir=path, parser='scientific', read_mol=1, set_model_num=2,
set_mol_name='lactose_MCMM4_S1b')
# Try loading a few protons.
self.relax.interpreter._Structure.load_spins('@*H*')
r9276 - /1.3/test_suite/system_tests/structure.py