Fixed order for read and converter tests.

MoseleyBioinformaticsLab · Jan 10, 2017 · b14baa2 · b14baa2
1 parent a95ebfb
commit b14baa2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tests/test_converter.py b/tests/test_converter.py
@@ -38,7 +38,7 @@ def test_from_nmrstar_to_json_directory():
     starfile_generator = nmrstarlib.read_files("tests/example_data/tmp/starfiles_directory_json")
     starfile1 = next(starfile_generator)
     starfile2 = next(starfile_generator)
-    assert starfile1.bmrbid == "15000" and starfile2.bmrbid == "18569"
+    assert starfile1.bmrbid in ("15000", "18569") and starfile2.bmrbid in ("15000", "18569")
 
 
 def test_from_json_to_nmrstar_directory():
@@ -50,4 +50,4 @@ def test_from_json_to_nmrstar_directory():
     starfile_generator = nmrstarlib.read_files("tests/example_data/tmp/starfiles_directory_nmrstar")
     starfile1 = next(starfile_generator)
     starfile2 = next(starfile_generator)
-    assert starfile1.bmrbid == "15000" and starfile2.bmrbid == "18569"
+    assert starfile1.bmrbid in ("15000", "18569") and starfile2.bmrbid in ("15000", "18569")
diff --git a/tests/test_reading.py b/tests/test_reading.py
@@ -24,32 +24,32 @@ def test_from_bmrbids():
     starfile_generator = nmrstarlib.read_files("15000", "18569")
     starfile1 = next(starfile_generator)
     starfile2 = next(starfile_generator)
-    assert starfile1.bmrbid == "15000" and starfile2.bmrbid == "18569"
+    assert starfile1.bmrbid in ("15000", "18569") and starfile2.bmrbid in ("15000", "18569")
 
 
 def test_from_directory():
     starfile_generator = nmrstarlib.read_files("tests/example_data/starfiles_directory")
     starfile1 = next(starfile_generator)
     starfile2 = next(starfile_generator)
-    assert starfile1.bmrbid == "15000" and starfile2.bmrbid == "18569"
+    assert starfile1.bmrbid in ("15000", "18569") and starfile2.bmrbid in ("15000", "18569")
 
 
 def test_from_zip_archive():
     starfile_generator = nmrstarlib.read_files("tests/example_data/starfiles_archive.zip")
     starfile1 = next(starfile_generator)
     starfile2 = next(starfile_generator)
-    assert starfile1.bmrbid == "15000" and starfile2.bmrbid == "18569"
+    assert starfile1.bmrbid in ("15000", "18569") and starfile2.bmrbid in ("15000", "18569")
 
 
 def test_from_tar_gz_archive():
     starfile_generator = nmrstarlib.read_files("tests/example_data/starfiles_archive.tar.gz")
     starfile1 = next(starfile_generator)
     starfile2 = next(starfile_generator)
-    assert starfile1.bmrbid == "15000" and starfile2.bmrbid == "18569"
+    assert starfile1.bmrbid in ("15000", "18569") and starfile2.bmrbid in ("15000", "18569")
 
 
 def test_from_tar_bz2_archive():
     starfile_generator = nmrstarlib.read_files("tests/example_data/starfiles_archive.tar.bz2")
     starfile1 = next(starfile_generator)
     starfile2 = next(starfile_generator)
-    assert starfile1.bmrbid == "15000" and starfile2.bmrbid == "18569"
+    assert starfile1.bmrbid in ("15000", "18569") and starfile2.bmrbid in ("15000", "18569")