diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2017-01-18 13:34:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 13:34:19 -0800 |
| commit | 0c8bc250c7d9f97eff0360ed4ca6ca149892c15b (patch) | |
| tree | 0ddf9a79bd96be8c88c283a0c2ea8f1b735dc030 | |
| parent | e744056d8f7ebcf7f0410a52d801d9ca552f69ad (diff) | |
| parent | 553a645f1d6f950bf1a36284bb13b5fc7c3bacdc (diff) | |
| download | caffeonacl-0c8bc250c7d9f97eff0360ed4ca6ca149892c15b.tar.gz caffeonacl-0c8bc250c7d9f97eff0360ed4ca6ca149892c15b.tar.bz2 caffeonacl-0c8bc250c7d9f97eff0360ed4ca6ca149892c15b.zip | |
Merge pull request #4842 from willyd/pytest-fix
fix pytest temporary files on Windows
| -rw-r--r-- | python/caffe/test/test_net.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/python/caffe/test/test_net.py b/python/caffe/test/test_net.py index e1090934..a0739fba 100644 --- a/python/caffe/test/test_net.py +++ b/python/caffe/test/test_net.py @@ -173,12 +173,12 @@ layer { """ def setUp(self): - self.f = tempfile.NamedTemporaryFile(mode='w+') + self.f = tempfile.NamedTemporaryFile(mode='w+', delete=False) self.f.write(self.TEST_NET) - self.f.flush() + self.f.close() def tearDown(self): - self.f.close() + os.remove(self.f.name) def check_net(self, net, blobs): net_blobs = [b for b in net.blobs.keys() if 'data' not in b] @@ -238,12 +238,12 @@ layer { """ def setUp(self): - self.f = tempfile.NamedTemporaryFile(mode='w+') + self.f = tempfile.NamedTemporaryFile(mode='w+', delete=False) self.f.write(self.TEST_NET) - self.f.flush() + self.f.close() def tearDown(self): - self.f.close() + os.remove(self.f.name) def check_net(self, net, blobs): net_blobs = [b for b in net.blobs.keys() if 'data' not in b] @@ -320,12 +320,12 @@ layer { """ def setUp(self): - self.f = tempfile.NamedTemporaryFile(mode='w+') + self.f = tempfile.NamedTemporaryFile(mode='w+', delete=False) self.f.write(self.TEST_NET) - self.f.flush() + self.f.close() def tearDown(self): - self.f.close() + os.remove(self.f.name) def check_net(self, net, outputs): self.assertEqual(list(net.blobs['data'].shape), [1,1,10,10]) |