Merge pull request #54 from jvivian/jvivian/issue53

Un-skip Failure test

coverage.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
-<coverage version="7.3.1" timestamp="1709533757806" lines-valid="191" lines-covered="186" line-rate="0.9738" branches-valid="66" branches-covered="61" branch-rate="0.9242" complexity="0">
+<coverage version="7.3.1" timestamp="1709534576492" lines-valid="191" lines-covered="190" line-rate="0.9948" branches-valid="66" branches-covered="63" branch-rate="0.9545" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.3.1 -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>
 		<source>/home/jvivian/covid19-drDFM/covid19_drdfm</source>
 	</sources>
 	<packages>
-		<package name="." line-rate="0.9738" branch-rate="0.9242" complexity="0">
+		<package name="." line-rate="0.9948" branch-rate="0.9545" complexity="0">
 			<classes>
 				<class name="cli.py" filename="cli.py" complexity="0" line-rate="1" branch-rate="1">
 					<methods/>
@@ -47,7 +47,7 @@
 						<line number="153" hits="1"/>
 					</lines>
 				</class>
-				<class name="dfm.py" filename="dfm.py" complexity="0" line-rate="0.9375" branch-rate="0.85">
+				<class name="dfm.py" filename="dfm.py" complexity="0" line-rate="1" branch-rate="0.95">
 					<methods/>
 					<lines>
 						<line number="7" hits="1"/>
@@ -89,10 +89,10 @@
 						<line number="91" hits="1"/>
 						<line number="92" hits="1"/>
 						<line number="93" hits="1"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0" branch="true" condition-coverage="0% (0/2)" missing-branches="96,97"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
+						<line number="94" hits="1"/>
+						<line number="95" hits="1" branch="true" condition-coverage="100% (2/2)"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
 						<line number="98" hits="1"/>
 						<line number="99" hits="1"/>
 						<line number="102" hits="1"/>

tests/test_dfm.py

@@ -44,7 +44,7 @@ def test_run_model_global_0():
     shutil.rmtree("./testdir")
 
 
-@pytest.mark.skip(reason="State no longer failing")
+# @pytest.mark.skip(reason="State no longer failing")
 def test_run_failure():
     """
     Test the run_parameterized_model function for a state with known failure conditions
@@ -57,7 +57,8 @@ def test_run_failure():
         None
     """
     df = get_df()
-    state = "OR"
+    df = df[df.Time > "2019-01-01"]
+    state = "PA"
     run_parameterized_model(df, state, Path("./testdir"), global_multiplier=2)
     assert Path("./testdir/failed.txt").exists()
     shutil.rmtree("./testdir")