Skip to content

Commit 863826b

Browse files
author
Kevin D Smith
committed
Update tests for various server versions
1 parent f084f88 commit 863826b

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

swat/tests/cas/test_casa.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ def test_dynamic_table_open(self):
6767
r = self.s.sessionProp.setsessopt(caslib=self.srcLib)
6868

6969
r = self.s.actionTest.testdynamictable(tableinfo=self.tablename)
70-
self.assertEqual(r.messages[0], "NOTE: Table '" + self.tablename + "':")
71-
self.assertEqual(r.messages[1], "NOTE: -->Name: " + self.tablename)
72-
self.assertEqual(r.messages[2], "NOTE: -->nRecs: 428")
73-
self.assertEqual(r.messages[3], "NOTE: -->nVars: 15")
70+
self.assertIn("NOTE: Table '" + self.tablename + "':", r.messages)
71+
self.assertIn("NOTE: -->Name: " + self.tablename, r.messages)
72+
self.assertIn("NOTE: -->nRecs: 428", r.messages)
73+
self.assertIn( "NOTE: -->nVars: 15", r.messages)
7474

7575
self.s.droptable(caslib=self.srcLib, table=self.tablename)
7676

swat/tests/cas/test_params.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,8 @@ def test_alltypesWithZeroArguments(self):
370370
# Developer said we might get a table name back but that is about all.
371371
# The alltypes action is for testing only.
372372
self.assertIsNotNone(r)
373-
self.assertEqual(r.severity, 0)
373+
if not r.messages or not r.messages[0].startswith('WARNING: License for feature'):
374+
self.assertEqual(r.severity, 0)
374375

375376
# Cleanup after ourselves
376377
r = self.s.table.droptable(caslib=r['caslib'], table=r['tableName'])

swat/tests/cas/test_response.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,11 @@ def test_disposition(self):
100100
conn = self.table.invoke('loadactionset', actionset='simple')
101101

102102
for resp in conn:
103-
self.assertEqual(resp.messages, ["NOTE: Added action set 'simple'."])
104-
self.assertEqual(resp.disposition.to_dict(), dict(debug=None, reason=None,
105-
severity=0, status=None,
106-
status_code=0))
103+
self.assertIn("NOTE: Added action set 'simple'.", resp.messages)
104+
if not resp.messages[0].startswith('WARNING: License for feature'):
105+
self.assertEqual(resp.disposition.to_dict(), dict(debug=None, reason=None,
106+
severity=0, status=None,
107+
status_code=0))
107108
self.assertEqual(set(resp.performance.to_dict().keys()),
108109
set(['cpu_system_time', 'cpu_user_time', 'elapsed_time', 'memory',
109110
'memory_os', 'memory_quota', 'system_cores',

swat/tests/cas/test_table.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,11 @@ def test_mean(self):
12721272
out = self.table.datastep('keep Make Model Type Origin').mean().tolist()
12731273

12741274
def test_skew(self):
1275-
skew = self.table.skew()
1275+
try:
1276+
skew = self.table.skew()
1277+
except KeyError, msg:
1278+
if 'skew' in msg:
1279+
unittest.skip('CAS server does not support skew')
12761280
dfskew = self.get_cars_df().skew()
12771281
self.assertTablesEqual(skew, dfskew, precision=4)
12781282

@@ -1291,7 +1295,11 @@ def test_skew(self):
12911295
self.assertTablesEqual(skew, dfskew, precision=4)
12921296

12931297
def test_kurt(self):
1294-
kurt = self.table.kurt()
1298+
try:
1299+
kurt = self.table.kurt()
1300+
except KeyError, msg:
1301+
if 'kurt' in msg:
1302+
unittest.skip('CAS server does not support kurtosis')
12951303
dfkurt = self.get_cars_df().kurt()
12961304
self.assertTablesEqual(kurt, dfkurt, precision=4)
12971305

0 commit comments

Comments
 (0)