diff --git a/emission/tests/netTests/TestPipeline.py b/emission/tests/netTests/TestPipeline.py index f98964e60..54f81ba8e 100644 --- a/emission/tests/netTests/TestPipeline.py +++ b/emission/tests/netTests/TestPipeline.py @@ -6,14 +6,17 @@ import emission.core.get_database as edb import emission.core.wrapper.localdate as ecwl import emission.tests.common as etc +import emission.pipeline.intake_stage as epi from emission.net.api import pipeline class TestPipeline(unittest.TestCase): def setUp(self): + self.testEmail="foo@foo.com" etc.setupRealExample(self, "emission/tests/data/real_examples/shankari_2015-aug-21") self.testUUID1 = self.testUUID + self.testEmail="bar@bar.com" etc.setupRealExample(self, "emission/tests/data/real_examples/shankari_2015-aug-27") @@ -22,6 +25,7 @@ def tearDown(self): def clearRelatedDb(self): edb.get_timeseries_db().delete_many({"user_id": self.testUUID}) + edb.get_profile_db().delete_many({"user_id": self.testUUID}) edb.get_analysis_timeseries_db().delete_many({"user_id": self.testUUID}) edb.get_pipeline_state_db().delete_many({"user_id": self.testUUID}) edb.get_timeseries_db().delete_many({"user_id": self.testUUID1}) @@ -33,8 +37,10 @@ def testNoAnalysisResults(self): def testAnalysisResults(self): self.assertEqual(pipeline.get_range(self.testUUID), (None, None)) - etc.runIntakePipeline(self.testUUID) - self.assertAlmostEqual(pipeline.get_range(self.testUUID), (1440688739.672, 1440729142.709)) + epi.run_intake_pipeline_for_user(self.testUUID, skip_if_no_new_data = False) + pr = pipeline.get_range(self.testUUID) + self.assertAlmostEqual(pr[0], 1440688739.672) + self.assertAlmostEqual(pr[1], 1440729142.709) if __name__ == '__main__': import emission.tests.common as etc