more encoding cleanup in dafTests

This commit is contained in:
Michael James 2018-10-09 15:15:10 -06:00
parent 60e470c02c
commit 96aa8266b9
4 changed files with 7 additions and 7 deletions

View file

@ -57,14 +57,14 @@ def get_hdf5_data(idra):
threshVals = [] threshVals = []
if len(idra) > 0: if len(idra) > 0:
for ii in range(len(idra)): for ii in range(len(idra)):
if idra[ii].getName() == b"Data": if idra[ii].getName() == "Data":
rdat = idra[ii] rdat = idra[ii]
elif idra[ii].getName() == b"Angles": elif idra[ii].getName() == "Angles":
azdat = idra[ii] azdat = idra[ii]
dattyp = "radial" dattyp = "radial"
elif idra[ii].getName() == b"DependentValues": elif idra[ii].getName() == "DependentValues":
depVals = idra[ii].getShortData() depVals = idra[ii].getShortData()
elif idra[ii].getName() == b"Thresholds": elif idra[ii].getName() == "Thresholds":
threshVals = idra[ii].getShortData() threshVals = idra[ii].getShortData()
return rdat,azdat,depVals,threshVals return rdat,azdat,depVals,threshVals

View file

@ -23,7 +23,7 @@ import unittest
class BufrMosTestCase(baseDafTestCase.DafTestCase): class BufrMosTestCase(baseDafTestCase.DafTestCase):
"""Base class for testing DAF support of bufrmos data""" """Base class for testing DAF support of bufrmos data"""
data_params = b"temperature", b"dewpoint" data_params = "temperature", "dewpoint"
def testGetAvailableParameters(self): def testGetAvailableParameters(self):
req = DAL.newDataRequest(self.datatype) req = DAL.newDataRequest(self.datatype)

View file

@ -24,6 +24,6 @@ class BufrMosHpcTestCase(baseBufrMosTestCase.BufrMosTestCase):
"""Test DAF support for bufrmosHPC data""" """Test DAF support for bufrmosHPC data"""
datatype = "bufrmosHPC" datatype = "bufrmosHPC"
data_params = b"forecastHr", b"maxTemp24Hour" data_params = "forecastHr", "maxTemp24Hour"
# All tests inherited from superclass # All tests inherited from superclass

View file

@ -24,6 +24,6 @@ class BufrMosMrfTestCase(baseBufrMosTestCase.BufrMosTestCase):
"""Test DAF support for bufrmosMRF data""" """Test DAF support for bufrmosMRF data"""
datatype = "bufrmosMRF" datatype = "bufrmosMRF"
data_params = b"forecastHr", b"maxTempDay" data_params = "forecastHr", "maxTempDay"
# All tests inherited from superclass # All tests inherited from superclass