I've been annoyed by the /tmp/mrtg-temp*dir directories that are created by the sipXconfig build. I've written a change to delete them after use, and it seems to work in my builds. The change is to delete them in MRTGConfigTest::tearDown() and MonitoringContextImplTest::tearDown().
Could the Config people please review this change? The change is currently in svn diff -c 18032 http://sipxecs.sipfoundry.org/rep/sipXecs/branches/user_dworley_post4.2 Index: sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MRTGConfigTest.java =================================================================== --- sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MRTGConfigTest.java (revision 18031) +++ sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MRTGConfigTest.java (revision 18032) @@ -22,13 +22,14 @@ public class MRTGConfigTest extends TestCase { private MRTGConfig m_mrtgConfig; + private File m_mrtgTempDir; private File m_mrtgConfigFile; protected void setUp() throws Exception { - File mrtgTempDir = TestUtil.createTempDir("mrtg-temp"); + m_mrtgTempDir = TestUtil.createTempDir("mrtg-temp"); FileInputStream mrtgCfgStream = new FileInputStream(TestUtil.getTestSourceDirectory(getClass()) + "/" + "mrtg.cfg"); - TestHelper.copyStreamToDirectory(mrtgCfgStream, mrtgTempDir.getAbsolutePath(), "mrtg.cfg"); - m_mrtgConfigFile = new File(mrtgTempDir, "mrtg.cfg"); + TestHelper.copyStreamToDirectory(mrtgCfgStream, m_mrtgTempDir.getAbsolutePath(), "mrtg.cfg"); + m_mrtgConfigFile = new File(m_mrtgTempDir, "mrtg.cfg"); m_mrtgConfig = new MRTGConfig(m_mrtgConfigFile.toString()); try { @@ -39,6 +40,11 @@ } } + protected void tearDown() throws Exception { + m_mrtgConfigFile.delete(); + m_mrtgTempDir.delete(); + } + public void testGetMRTGConfigTargets() { assertEquals(m_mrtgConfigFile.toString(), m_mrtgConfig .getFilename()); Index: sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MonitoringContextImplTest.java =================================================================== --- sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MonitoringContextImplTest.java (revision 18031) +++ sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MonitoringContextImplTest.java (revision 18032) @@ -29,6 +29,8 @@ private LocationsManager m_locationsManager; private MRTGConfig m_mrtgConfig; private MRTGConfig m_mrtgTemplateConfig; + private File m_mrtgTempDir; + private File m_mrtgConfigFile; @Override protected void setUp() throws Exception { @@ -48,10 +50,11 @@ m_monitoringContextImpl.setLocationsManager(m_locationsManager); - File mrtgTempDir = TestUtil.createTempDir("mrtg-temp"); + m_mrtgTempDir = TestUtil.createTempDir("mrtg-temp"); FileInputStream mrtgCfgStream = new FileInputStream(TestUtil.getTestSourceDirectory(getClass()) + "/" + "mrtg.cfg"); - TestHelper.copyStreamToDirectory(mrtgCfgStream, mrtgTempDir.getAbsolutePath(), "mrtg.cfg"); - m_mrtgConfig = new MRTGConfig(new File(mrtgTempDir, "mrtg.cfg").toString()); + TestHelper.copyStreamToDirectory(mrtgCfgStream, m_mrtgTempDir.getAbsolutePath(), "mrtg.cfg"); + m_mrtgConfigFile = new File(m_mrtgTempDir, "mrtg.cfg"); + m_mrtgConfig = new MRTGConfig(m_mrtgConfigFile.toString()); m_mrtgTemplateConfig = new MRTGConfig(TestUtil.getTestSourceDirectory(getClass()) + "/" + "mrtg-t.cfg"); m_monitoringContextImpl.setMrtgConfig(m_mrtgConfig); @@ -63,6 +66,11 @@ } } + protected void tearDown() throws Exception { + m_mrtgConfigFile.delete(); + m_mrtgTempDir.delete(); + } + public void testGetAvailableHosts() { List<String> availableHosts = m_monitoringContextImpl.getAvailableHosts(); assertEquals(2, availableHosts.size()); Dale _______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev sipXecs IP PBX -- http://www.sipfoundry.org/
