Make tests results more flexible

Author: Kevin D Smith

swat/tests/cas/test_basics.py

@@ -267,8 +267,12 @@ def test_alltypes(self):
         self.assertEqual(data.ix[:,'Int32'][0], 42)
         self.assertIn(type(data.ix[:,'Int32'][0]), [np.int32, np.int64])
 
-        self.assertEqual(data.ix[:,'Int64'][0], 9223372036854775807)
-        self.assertEqual(type(data.ix[:,'Int64'][0]), np.int64)
+        # REST interface can sometimes overflow the JSON float
+        if np.isnan(data.ix[:,'Int64'][0]):
+            self.assertEqual(type(data.ix[:,'Int64'][0]), np.float64)
+        else:
+            self.assertEqual(data.ix[:,'Int64'][0], 9223372036854775807)
+            self.assertEqual(type(data.ix[:,'Int64'][0]), np.int64)
 
         self.assertEqual(data.ix[:,'Date'][0], datetime.date(1963, 5, 19))
         self.assertEqual(type(data.ix[:,'Date'][0]), datetime.date)

swat/tests/cas/test_results.py

@@ -316,7 +316,7 @@ def test_str(self):
         self.assertTrue('[ByGroup1.Topk]' in sout)
         self.assertTrue('[ByGroup2.Topk]' in sout)
         self.assertTrue('[ByGroup3.Topk]' in sout)
-        self.assertTrue('+ Elapsed: ' in sout)
+        self.assertTrue('+ Elapsed: ' in sout or '+ Mem: ' in sout)
 
     def test_render_html(self):
         out = self.table.groupby('Origin').topk()