Minor fixes for tests.

bartongroup · Sep 27, 2017 · 9e03152 · 9e03152
1 parent 4414b65
commit 9e03152
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/prointvar/arpeggio.py b/prointvar/arpeggio.py
@@ -232,10 +232,10 @@ def _parse_arpeggio_atom(s):
 
         return table
 
-    tbA = _parse_arpeggio_atom(table['ENTRY_A'])
-    tbB = _parse_arpeggio_atom(table['ENTRY_B'])
-    table = table.join(tbA.join(tbB))
-
+    if not table.empty:
+        tbA = _parse_arpeggio_atom(table['ENTRY_A'])
+        tbB = _parse_arpeggio_atom(table['ENTRY_B'])
+        table = table.join(tbA.join(tbB))
     return table
 
 

diff --git a/tests/test_arpeggio.py b/tests/test_arpeggio.py
@@ -273,8 +273,8 @@ def test_collapsed_contacts(self):
         data = reader.contacts(collapsed_cont=True, col_method='full')
         self.assertNotIn('IONIC', list(data))
         self.assertIn('Int_Types', list(data))
-        self.assertEqual('VDW-Proximal, Polar-Bond',
-                         ', '.join(list(data.loc[3, 'Int_Types'])))
+        self.assertEqual('Polar-Bond, VDW-Proximal',
+                         ', '.join(sorted(list(data.loc[3, 'Int_Types']))))
         reader = self.reader(self.inputarpeggio)
         data = reader.contacts()
         data = self.collapsed_contacts(data, col_method='minimal')

diff --git a/tests/test_variants.py b/tests/test_variants.py
@@ -139,7 +139,7 @@ def tearDown(self):
         self.get_preferred_uniprot_id_from_mapping = None
         self.get_preferred_ensembl_id_from_mapping = None
         self.flatten_ensembl_variants = None
-        self.vagg = VariantsAgreggator
+        self.vagg = None
 
         logging.disable(logging.NOTSET)