Intervention test updates gh 204

InstituteforDiseaseModeling / covasim

COVID-19 Agent-based Simulator (Covasim): a model for exploring coronavirus dynamics and interventions

https://covasim.org

MIT License

250 stars 223 forks source link

Intervention test updates gh 204 #207

Closed CWiswell-IDM closed 4 years ago

CWiswell-IDM commented 4 years ago

I'm not sure why this shows any conflicts with master, as I rebased off of IfDM master (the conflicting change had been the @unittest.skip() over two of the tests that are changed here).

I believe that I resolved these conflicts locally and force-pushed to my repository, which should have resolved this.

CWiswell-IDM commented 4 years ago

There we go. (Conflict resolved, I'd missed one of the "unittest skip" lines)

CWiswell-IDM commented 4 years ago

Should resolve #204

cliffckerr commented 4 years ago

@CWiswell-IDM :facepalm: sorry, I see you did change that test. It looks like it's still being skipped though?

CWiswell-IDM commented 4 years ago

looking... ah, had apparently missed this one somehow. Re-enabled...

cliffckerr commented 4 years ago

Merged, thanks @CWiswell-IDM !