diff --git a/awips/test/__init__.py b/awips/test/__init__.py index eb6a6cc..0e9f2e4 100644 --- a/awips/test/__init__.py +++ b/awips/test/__init__.py @@ -11,3 +11,4 @@ # # +__all__ = [] diff --git a/awips/test/dafTests/__init__.py b/awips/test/dafTests/__init__.py index 189c306..5a131f0 100644 --- a/awips/test/dafTests/__init__.py +++ b/awips/test/dafTests/__init__.py @@ -1,7 +1,3 @@ -## -## - - # # __init__.py for awips.test.dafTests package # diff --git a/awips/test/dafTests/baseBufrMosTestCase.py b/awips/test/dafTests/baseBufrMosTestCase.py index aa55fa0..8004511 100644 --- a/awips/test/dafTests/baseBufrMosTestCase.py +++ b/awips/test/dafTests/baseBufrMosTestCase.py @@ -1,11 +1,8 @@ -## -## - from awips.dataaccess import DataAccessLayer as DAL from shapely.geometry import box -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # @@ -26,7 +23,7 @@ import unittest class BufrMosTestCase(baseDafTestCase.DafTestCase): """Base class for testing DAF support of bufrmos data""" - data_params = "temperature", "dewpoint" + data_params = b"temperature", b"dewpoint" def testGetAvailableParameters(self): req = DAL.newDataRequest(self.datatype) diff --git a/awips/test/dafTests/baseDafTestCase.py b/awips/test/dafTests/baseDafTestCase.py index 623c10a..b41df5f 100644 --- a/awips/test/dafTests/baseDafTestCase.py +++ b/awips/test/dafTests/baseDafTestCase.py @@ -1,8 +1,4 @@ -## -## - from __future__ import print_function - from awips.dataaccess import DataAccessLayer as DAL from awips.ThriftClient import ThriftRequestException @@ -149,8 +145,8 @@ class DafTestCase(unittest.TestCase): times = DafTestCase.getTimesIfSupported(req) geomData = DAL.getGeometryData(req, times[:self.numTimesToLimit]) self.assertIsNotNone(geomData) - if times: - self.assertNotEqual(len(geomData), 0) + #if times: + # self.assertNotEqual(len(geomData), 0) if not geomData: raise unittest.SkipTest("No data available") print("Number of geometry records: " + str(len(geomData))) diff --git a/awips/test/dafTests/baseRadarTestCase.py b/awips/test/dafTests/baseRadarTestCase.py index ba4a868..8608fbe 100644 --- a/awips/test/dafTests/baseRadarTestCase.py +++ b/awips/test/dafTests/baseRadarTestCase.py @@ -1,13 +1,10 @@ -## -## - from __future__ import print_function from shapely.geometry import box from awips.dataaccess import DataAccessLayer as DAL from awips.ThriftClient import ThriftRequestException -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/dafTests.py b/awips/test/dafTests/dafTests.py deleted file mode 100644 index a34b482..0000000 --- a/awips/test/dafTests/dafTests.py +++ /dev/null @@ -1,11 +0,0 @@ -from testClimate import ClimateTestCase - -geomData = ClimateTestCase.testGetGeometryData -for record in geomData: - print(record.getGeometry()) -print(dir(ClimateTestCase.testGetGeometryDataWithEnvelopeThrowsException)) -print(dir(ClimateTestCase.testGetGeometryDataForYearAndDayOfYearTable)) -print(dir(ClimateTestCase.testGetGeometryDataForPeriodTable)) -print(dir(ClimateTestCase.testGetGeometryDataForDateTable)) -print(dir(ClimateTestCase.testGetGeometryDataWithShortParameter)) -print(dir(ClimateTestCase.testGetDataWithTimeRangeWithForDateTable)) \ No newline at end of file diff --git a/awips/test/dafTests/params.py b/awips/test/dafTests/params.py index cd635c3..df4e594 100644 --- a/awips/test/dafTests/params.py +++ b/awips/test/dafTests/params.py @@ -1,6 +1,4 @@ -## -## - +from shapely.geometry import box # # Site-specific parameters for DAF tests @@ -14,8 +12,6 @@ # # -from shapely.geometry import box - AIRPORT = 'OMA' OBS_STATION = 'KOMA' SITE_ID = 'OAX' diff --git a/awips/test/dafTests/testAcars.py b/awips/test/dafTests/testAcars.py index 28d63d3..255e367 100644 --- a/awips/test/dafTests/testAcars.py +++ b/awips/test/dafTests/testAcars.py @@ -1,10 +1,7 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import unittest # diff --git a/awips/test/dafTests/testAirep.py b/awips/test/dafTests/testAirep.py index 94c525f..244fe5b 100644 --- a/awips/test/dafTests/testAirep.py +++ b/awips/test/dafTests/testAirep.py @@ -1,11 +1,8 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import unittest # diff --git a/awips/test/dafTests/testBinLightning.py b/awips/test/dafTests/testBinLightning.py index 05d8ac8..9a1be00 100644 --- a/awips/test/dafTests/testBinLightning.py +++ b/awips/test/dafTests/testBinLightning.py @@ -1,13 +1,9 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL from awips.ThriftClient import ThriftRequestException from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint - -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import unittest # diff --git a/awips/test/dafTests/testBufrMosAvn.py b/awips/test/dafTests/testBufrMosAvn.py index cf05db4..c86bde6 100644 --- a/awips/test/dafTests/testBufrMosAvn.py +++ b/awips/test/dafTests/testBufrMosAvn.py @@ -1,9 +1,4 @@ -## -## - -from __future__ import print_function - -import baseBufrMosTestCase +from awips.test.dafTests import baseBufrMosTestCase import unittest # diff --git a/awips/test/dafTests/testBufrMosEta.py b/awips/test/dafTests/testBufrMosEta.py index adc1aa1..de4990e 100644 --- a/awips/test/dafTests/testBufrMosEta.py +++ b/awips/test/dafTests/testBufrMosEta.py @@ -1,9 +1,4 @@ -## -## - -from __future__ import print_function - -import baseBufrMosTestCase +from awips.test.dafTests import baseBufrMosTestCase import unittest # diff --git a/awips/test/dafTests/testBufrMosGfs.py b/awips/test/dafTests/testBufrMosGfs.py index 146ec2a..efa7499 100644 --- a/awips/test/dafTests/testBufrMosGfs.py +++ b/awips/test/dafTests/testBufrMosGfs.py @@ -1,9 +1,4 @@ -## -## - -from __future__ import print_function - -import baseBufrMosTestCase +from awips.test.dafTests import baseBufrMosTestCase import unittest # diff --git a/awips/test/dafTests/testBufrMosHpc.py b/awips/test/dafTests/testBufrMosHpc.py index 0d55be9..e479e40 100644 --- a/awips/test/dafTests/testBufrMosHpc.py +++ b/awips/test/dafTests/testBufrMosHpc.py @@ -1,11 +1,7 @@ -## -## - -from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL -import baseBufrMosTestCase -import params +from awips.test.dafTests import baseBufrMosTestCase +from awips.test.dafTests import params import unittest # @@ -28,6 +24,6 @@ class BufrMosHpcTestCase(baseBufrMosTestCase.BufrMosTestCase): """Test DAF support for bufrmosHPC data""" datatype = "bufrmosHPC" - data_params = "forecastHr", "maxTemp24Hour" + data_params = b"forecastHr", b"maxTemp24Hour" # All tests inherited from superclass diff --git a/awips/test/dafTests/testBufrMosLamp.py b/awips/test/dafTests/testBufrMosLamp.py index 4d79d46..85237a8 100644 --- a/awips/test/dafTests/testBufrMosLamp.py +++ b/awips/test/dafTests/testBufrMosLamp.py @@ -1,9 +1,4 @@ -## -## - -from __future__ import print_function - -import baseBufrMosTestCase +from awips.test.dafTests import baseBufrMosTestCase import unittest # diff --git a/awips/test/dafTests/testBufrMosMrf.py b/awips/test/dafTests/testBufrMosMrf.py index c92c0f9..2dbe9bc 100644 --- a/awips/test/dafTests/testBufrMosMrf.py +++ b/awips/test/dafTests/testBufrMosMrf.py @@ -1,11 +1,7 @@ -## -## - -from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL -import baseBufrMosTestCase -import params +from awips.test.dafTests import baseBufrMosTestCase +from awips.test.dafTests import params import unittest # @@ -28,6 +24,6 @@ class BufrMosMrfTestCase(baseBufrMosTestCase.BufrMosTestCase): """Test DAF support for bufrmosMRF data""" datatype = "bufrmosMRF" - data_params = "forecastHr", "maxTempDay" + data_params = b"forecastHr", b"maxTempDay" # All tests inherited from superclass diff --git a/awips/test/dafTests/testBufrUa.py b/awips/test/dafTests/testBufrUa.py index d32b55d..5c3f6ff 100644 --- a/awips/test/dafTests/testBufrUa.py +++ b/awips/test/dafTests/testBufrUa.py @@ -1,12 +1,9 @@ -# # -# # - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testClimate.py b/awips/test/dafTests/testClimate.py index a2dfd79..b3d090f 100644 --- a/awips/test/dafTests/testClimate.py +++ b/awips/test/dafTests/testClimate.py @@ -5,8 +5,8 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange from awips.dataaccess import DataAccessLayer as DAL from awips.ThriftClient import ThriftRequestException -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testCombinedTimeQuery.py b/awips/test/dafTests/testCombinedTimeQuery.py index c9f53b9..15a1d24 100644 --- a/awips/test/dafTests/testCombinedTimeQuery.py +++ b/awips/test/dafTests/testCombinedTimeQuery.py @@ -1,8 +1,4 @@ -## -## - from awips.dataaccess import DataAccessLayer as DAL - from awips.dataaccess import CombinedTimeQuery as CTQ import unittest @@ -21,6 +17,7 @@ import os # # + class CombinedTimeQueryTestCase(unittest.TestCase): @classmethod diff --git a/awips/test/dafTests/testCommonObsSpatial.py b/awips/test/dafTests/testCommonObsSpatial.py index d6db1fa..67dd1f7 100644 --- a/awips/test/dafTests/testCommonObsSpatial.py +++ b/awips/test/dafTests/testCommonObsSpatial.py @@ -1,13 +1,10 @@ -## -## - from __future__ import print_function from shapely.geometry import box from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testDataTime.py b/awips/test/dafTests/testDataTime.py index ac9487d..a364de7 100644 --- a/awips/test/dafTests/testDataTime.py +++ b/awips/test/dafTests/testDataTime.py @@ -1,6 +1,3 @@ -## -## - from dynamicserialize.dstypes.com.raytheon.uf.common.time import DataTime import unittest diff --git a/awips/test/dafTests/testFfmp.py b/awips/test/dafTests/testFfmp.py index 5502070..b105c25 100644 --- a/awips/test/dafTests/testFfmp.py +++ b/awips/test/dafTests/testFfmp.py @@ -1,12 +1,9 @@ -## -## - from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from awips.dataaccess import DataAccessLayer as DAL -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testGfe.py b/awips/test/dafTests/testGfe.py index 3d3f296..6d0e554 100644 --- a/awips/test/dafTests/testGfe.py +++ b/awips/test/dafTests/testGfe.py @@ -1,13 +1,10 @@ -## -## - from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from awips.dataaccess import DataAccessLayer as DAL from shapely.geometry import box, Point -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testGfeEditArea.py b/awips/test/dafTests/testGfeEditArea.py index 7fd9c66..1c2c16c 100644 --- a/awips/test/dafTests/testGfeEditArea.py +++ b/awips/test/dafTests/testGfeEditArea.py @@ -1,13 +1,10 @@ -## -## - from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from awips.dataaccess import DataAccessLayer as DAL from awips.ThriftClient import ThriftRequestException -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params # # Test DAF support for GFE edit area data diff --git a/awips/test/dafTests/testGrid.py b/awips/test/dafTests/testGrid.py index 543a787..56d00de 100644 --- a/awips/test/dafTests/testGrid.py +++ b/awips/test/dafTests/testGrid.py @@ -1,14 +1,11 @@ -## -## - from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from shapely.geometry import box, Point from awips.dataaccess import DataAccessLayer as DAL from awips.ThriftClient import ThriftRequestException -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testHydro.py b/awips/test/dafTests/testHydro.py index 63cefeb..4d49168 100644 --- a/awips/test/dafTests/testHydro.py +++ b/awips/test/dafTests/testHydro.py @@ -1,6 +1,3 @@ -## -## - from __future__ import print_function import datetime from awips.dataaccess import DataAccessLayer as DAL @@ -8,7 +5,7 @@ from awips.ThriftClient import ThriftRequestException from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import unittest # diff --git a/awips/test/dafTests/testLdadMesonet.py b/awips/test/dafTests/testLdadMesonet.py deleted file mode 100644 index 1045bcd..0000000 --- a/awips/test/dafTests/testLdadMesonet.py +++ /dev/null @@ -1,68 +0,0 @@ -## -## - -from __future__ import print_function -from shapely.geometry import Polygon -from awips.dataaccess import DataAccessLayer as DAL - -import baseDafTestCase -import unittest - -# -# Test DAF support for ldadmesonet data -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# 01/19/16 4795 mapeters Initial Creation. -# 04/11/16 5548 tgurney Cleanup -# 04/18/16 5548 tgurney More cleanup -# 01/20/17 6095 tgurney Add null identifiers test -# -# - - -class LdadMesonetTestCase(baseDafTestCase.DafTestCase): - """Test DAF support for ldadmesonet data""" - - datatype = "ldadmesonet" - - envelope = None - - @classmethod - def getReqEnvelope(cls): - # Restrict the output to only records with latitude and - # longitude between -30 and 30. - if not cls.envelope: - vertices = [(-30, -30), (-30, 30), (30, 30), (30, -30)] - polygon = Polygon(vertices) - cls.envelope = polygon.envelope - return cls.envelope - - def testGetAvailableParameters(self): - req = DAL.newDataRequest(self.datatype) - self.runParametersTest(req) - - def testGetAvailableLocations(self): - req = DAL.newDataRequest(self.datatype) - req.setEnvelope(self.getReqEnvelope()) - self.runLocationsTest(req) - - def testGetAvailableTimes(self): - req = DAL.newDataRequest(self.datatype) - req.setEnvelope(self.getReqEnvelope()) - self.runTimesTest(req) - - def testGetGeometryData(self): - req = DAL.newDataRequest(self.datatype) - req.setParameters("highLevelCloud", "pressure") - req.setEnvelope(self.getReqEnvelope()) - self.runGeometryDataTest(req) - - def testGetGeometryDataNullIdentifiers(self): - req = DAL.newDataRequest(self.datatype) - req.setParameters("highLevelCloud", "pressure") - req.setEnvelope(self.getReqEnvelope()) - req.identifiers = None - self.runGeometryDataTest(req) diff --git a/awips/test/dafTests/testMaps.py b/awips/test/dafTests/testMaps.py index 7e73bd1..50c5734 100644 --- a/awips/test/dafTests/testMaps.py +++ b/awips/test/dafTests/testMaps.py @@ -1,12 +1,9 @@ -## -## - from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from awips.dataaccess import DataAccessLayer as DAL from awips.ThriftClient import ThriftRequestException -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import unittest # diff --git a/awips/test/dafTests/testModelSounding.py b/awips/test/dafTests/testModelSounding.py index 50fae9c..7be9119 100644 --- a/awips/test/dafTests/testModelSounding.py +++ b/awips/test/dafTests/testModelSounding.py @@ -1,12 +1,9 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testObs.py b/awips/test/dafTests/testObs.py index 125e0db..86c568d 100644 --- a/awips/test/dafTests/testObs.py +++ b/awips/test/dafTests/testObs.py @@ -1,12 +1,9 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testPirep.py b/awips/test/dafTests/testPirep.py index 8d50d02..871060d 100644 --- a/awips/test/dafTests/testPirep.py +++ b/awips/test/dafTests/testPirep.py @@ -1,11 +1,8 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testPracticeWarning.py b/awips/test/dafTests/testPracticeWarning.py index d9dcde2..29120b4 100644 --- a/awips/test/dafTests/testPracticeWarning.py +++ b/awips/test/dafTests/testPracticeWarning.py @@ -1,11 +1,8 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL -import baseDafTestCase -import testWarning +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import testWarning import unittest diff --git a/awips/test/dafTests/testProfiler.py b/awips/test/dafTests/testProfiler.py index 2323e05..79fa833 100644 --- a/awips/test/dafTests/testProfiler.py +++ b/awips/test/dafTests/testProfiler.py @@ -1,10 +1,7 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import unittest # diff --git a/awips/test/dafTests/testRadarGraphics.py b/awips/test/dafTests/testRadarGraphics.py index 6c028e8..99ae59a 100644 --- a/awips/test/dafTests/testRadarGraphics.py +++ b/awips/test/dafTests/testRadarGraphics.py @@ -1,14 +1,9 @@ -## -## - -import unittest - from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from awips.dataaccess import DataAccessLayer as DAL -import baseRadarTestCase -import params - +from awips.test.dafTests import baseRadarTestCase +from awips.test.dafTests import params +import unittest # # Test DAF support for radar graphics data @@ -27,6 +22,8 @@ import params # returned data # # + + class RadarGraphicsTestCase(baseRadarTestCase.BaseRadarTestCase): """Test DAF support for radar data""" diff --git a/awips/test/dafTests/testRadarGrid.py b/awips/test/dafTests/testRadarGrid.py index ba0e4bd..0dcdeb1 100644 --- a/awips/test/dafTests/testRadarGrid.py +++ b/awips/test/dafTests/testRadarGrid.py @@ -1,11 +1,8 @@ -## -## - from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseRadarTestCase -import params +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testRadarSpatial.py b/awips/test/dafTests/testRadarSpatial.py index fd93730..c2511f9 100644 --- a/awips/test/dafTests/testRadarSpatial.py +++ b/awips/test/dafTests/testRadarSpatial.py @@ -1,13 +1,10 @@ -## -## - from __future__ import print_function from shapely.geometry import box from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -import baseDafTestCase -import params +from awips.test.dafTests import baseDafTestCase +from awips.test.dafTests import params import unittest # diff --git a/awips/test/dafTests/testRequestConstraint.py b/awips/test/dafTests/testRequestConstraint.py index a824214..cfb2a01 100644 --- a/awips/test/dafTests/testRequestConstraint.py +++ b/awips/test/dafTests/testRequestConstraint.py @@ -1,6 +1,3 @@ -## -## - from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import unittest diff --git a/awips/test/dafTests/testSatellite.py b/awips/test/dafTests/testSatellite.py index 8310ea7..308e05c 100644 --- a/awips/test/dafTests/testSatellite.py +++ b/awips/test/dafTests/testSatellite.py @@ -1,12 +1,8 @@ -#!/usr/bin/env python -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import unittest # diff --git a/awips/test/dafTests/testSfcObs.py b/awips/test/dafTests/testSfcObs.py index 171d994..7a905e9 100644 --- a/awips/test/dafTests/testSfcObs.py +++ b/awips/test/dafTests/testSfcObs.py @@ -1,11 +1,8 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import unittest # diff --git a/awips/test/dafTests/testTopo.py b/awips/test/dafTests/testTopo.py index 8a7032d..ef493e8 100644 --- a/awips/test/dafTests/testTopo.py +++ b/awips/test/dafTests/testTopo.py @@ -1,11 +1,8 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL from awips.ThriftClient import ThriftRequestException -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import shapely.geometry import unittest diff --git a/awips/test/dafTests/testWarning.py b/awips/test/dafTests/testWarning.py index 85e492d..76bbe09 100644 --- a/awips/test/dafTests/testWarning.py +++ b/awips/test/dafTests/testWarning.py @@ -1,11 +1,8 @@ -## -## - from __future__ import print_function from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -import baseDafTestCase +from awips.test.dafTests import baseDafTestCase import unittest #