Allow list parameters to be sets as well; add fixes in tests for new server version

Author: Kevin D Smith

swat/cas/table.py

@@ -884,6 +884,8 @@ def append_columns(self, *items, **kwargs):
             varlist = list(self.columns)
         if not isinstance(varlist, items_types):
             varlist = [varlist]
+        else:
+            varlist = list(varlist)
         for item in _flatten(items):
             if item:
                 varlist.append(item)
@@ -918,6 +920,8 @@ def append_computedvars(self, *items, **kwargs):
             varlist = self.get_param('computedvars')
         if not isinstance(varlist, items_types):
             varlist = [varlist]
+        else:
+            varlist = list(varlist)
         for item in _flatten(items):
             if item:
                 varlist.append(item)
@@ -950,6 +954,8 @@ def append_groupby(self, *items, **kwargs):
         varlist = self.get_param('groupby', [])
         if not isinstance(varlist, items_types):
             varlist = [varlist]
+        else:
+            varlist = list(varlist)
         for item in _flatten(items):
             if item:
                 varlist.append(item)
@@ -984,6 +990,8 @@ def append_computedvarsprogram(self, *items, **kwargs):
             code = self.get_param('computedvarsprogram')
         if not isinstance(code, items_types):
             code = [code]
+        else:
+            code = list(code)
         for item in _flatten(items):
             if item:
                 code.append(item)
@@ -1055,6 +1063,8 @@ def append_where(self, *items, **kwargs):
         code = self.get_param('where', [])
         if not isinstance(code, items_types):
             code = [code]
+        else:
+            code = list(code)
         for item in _flatten(items):
             if item:
                 code.append(item)

swat/tests/cas/test_basics.py

@@ -497,17 +497,25 @@ def test_epdf_server_options_are_hidden(self):
         self.assertGreaterEqual(len(cfg), 3)
         self.assertEqual(cfg.columns[0], 'name')
         self.assertEqual(cfg.columns[1], 'description')
-        self.assertEqual(cfg.iloc[0].tolist(),
-                         ['setServOpt','sets a server option'])
+        item = cfg.iloc[0].tolist()
+        self.assertTrue(item == ['setServOpt','sets a server option'] or
+                        item == ['setServOpts','sets a server option'])
         self.assertEqual(cfg.iloc[1].tolist(),
                          ['getServOpt','displays the value of a server option'])
         self.assertEqual(cfg.iloc[2].tolist(),
                          ['listServOpts','Displays the server options and server values'])
 
         # List a hidden action 
         act = self.s.builtins.help(action='setServOpt', showHidden=True)
-        self.assertTrue(act is not None)
-        self.assertTrue(act['setServOpt'])
+        has_set_serv_opts = False
+        if not act:
+            act = self.s.builtins.help(action='setServOpts', showHidden=True)
+            self.assertTrue(act is not None)
+            self.assertTrue(act['setServOpts'])
+            has_set_serv_opts = True
+        else:
+            self.assertTrue(act is not None)
+            self.assertTrue(act['setServOpt'])
 
         # 03/09/2016: bosout: Didn't expect hidden action to be returned. Developers notified.
         # Comment out until we know what to expect.
@@ -526,12 +534,16 @@ def test_epdf_server_options_are_hidden(self):
         self.assertTrue(act['listServOpts'])         
 
         # See if we can set a hidden datafeeder option
-        with self.assertRaises(AttributeError):  
-            self.s.configuration.setServOpts(epdfsslusesni="NO")                         
+        if has_set_serv_opts:
+            out = self.s.configuration.setServOpts(epdfsslusesni="NO")
+            self.assertEqual( out.status, "Error parsing action parameters." )
+        else:
+            with self.assertRaises(AttributeError):
+                self.s.configuration.setServOpts(epdfsslusesni="NO")
 
         # See if we can get a hidden datafeeder option
         with self.assertRaises(AttributeError):
-            self.s.congiguration.getServOpts(name='epdfsslusesni')                  
+            self.s.configuration.getServOpts(name='epdfsslusesni')
 
         # See if hidden datafeeder options appear in the option list. 
         opts = self.s.configuration.listServOpts()

swat/tests/cas/test_connection.py

@@ -141,7 +141,6 @@ def test_dir(self):
 
         self.assertTrue('builtins.loadactionset' in dirout)
         self.assertTrue('table.loadtable' in dirout)
-        self.assertTrue('index' not in dirout)
         self.assertTrue('elasticsearch.index' not in dirout)
         self.assertTrue('sandindex' not in dirout)
         self.assertTrue('elasticsearch.sandindex' not in dirout)
@@ -152,7 +151,6 @@ def test_dir(self):
 
         self.assertTrue('builtins.loadactionset' in dirout)
         self.assertTrue('table.loadtable' in dirout)
-        self.assertTrue('index' in dirout)
         self.assertTrue('elasticsearch.index' in dirout)
         self.assertTrue('sandindex' in dirout)
         self.assertTrue('elasticsearch.sandindex' in dirout)

swat/tests/cas/test_table.py

@@ -173,7 +173,6 @@ def test_dir(self):
         self.assertTrue('sessionid' in dirout)
         self.assertTrue('session.sessionid' in dirout)
         self.assertTrue('elasticsearch' not in dirout)
-        self.assertTrue('index' not in dirout)
         self.assertTrue('elasticsearch.index' not in dirout)
         self.assertTrue('sandindex' not in dirout)
         self.assertTrue('elasticsearch.sandindex' not in dirout)
@@ -186,7 +185,6 @@ def test_dir(self):
         self.assertTrue('session.timeout' in dirout)
         self.assertTrue('sessionid' in dirout)
         self.assertTrue('session.sessionid' in dirout)
-        self.assertTrue('index' in dirout)
         self.assertTrue('elasticsearch.index' in dirout)
         self.assertTrue('sandindex' in dirout)
         self.assertTrue('elasticsearch.sandindex' in dirout)
@@ -2999,7 +2997,8 @@ def test_column_unique(self):
 
     def test_load_path(self):
         df = self.get_cars_df()
-        cars = self.s.load_path('datasources/cars_single.sashdat', caslib=self.srcLib)
+        cars = self.s.load_path('datasources/cars_single.sashdat', caslib=self.srcLib,
+                                casout=dict(replace=True))
         self.assertTablesEqual(df, cars)
 
     @unittest.skipIf(int(pd.__version__.split('.')[1]) <= 16, 'Need newer version of Pandas')