aboutsummaryrefslogtreecommitdiff
path: root/linaro_media_create
diff options
context:
space:
mode:
authorGuilherme Salgado <salgado@canonical.com>2011-01-14 14:29:07 -0600
committerGuilherme Salgado <salgado@canonical.com>2011-01-14 14:29:07 -0600
commit0528f1ef50d7a905e5bcbaf4d7eb79efab47d172 (patch)
treefcfd7e9686963994b78e983997bf8e72828830e0 /linaro_media_create
parentc06b0251405c1c41677e0f2b80c6224bc9159827 (diff)
Get rid of remove_binary_dir.py as the binary/ dir is now created in a temp directory that is always removed when the script exits.
Diffstat (limited to 'linaro_media_create')
-rw-r--r--linaro_media_create/remove_binary_dir.py11
-rw-r--r--linaro_media_create/tests/test_media_create.py16
2 files changed, 0 insertions, 27 deletions
diff --git a/linaro_media_create/remove_binary_dir.py b/linaro_media_create/remove_binary_dir.py
deleted file mode 100644
index c2b1438..0000000
--- a/linaro_media_create/remove_binary_dir.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import os.path
-
-from linaro_media_create import cmd_runner
-
-
-def remove_dir(directory, as_root=True):
- if os.path.exists(directory):
- proc = cmd_runner.run(['rm', '-rf', directory], as_root=as_root)
- proc.wait()
- return proc.returncode
- return 0
diff --git a/linaro_media_create/tests/test_media_create.py b/linaro_media_create/tests/test_media_create.py
index 1266ad4..6224120 100644
--- a/linaro_media_create/tests/test_media_create.py
+++ b/linaro_media_create/tests/test_media_create.py
@@ -49,7 +49,6 @@ from linaro_media_create.partitions import (
run_sfdisk_commands,
setup_partitions,
)
-from linaro_media_create.remove_binary_dir import remove_dir
from linaro_media_create.rootfs import (
create_flash_kernel_config,
has_space_left_for_swap,
@@ -153,21 +152,6 @@ class TestGetBootCmd(TestCase):
self.assertEqual(expected, boot_cmd)
-class TestRemoveBinaryDir(TestCaseWithFixtures):
-
- def setUp(self):
- super(TestRemoveBinaryDir, self).setUp()
- self.temp_dir_fixture = CreateTempDirFixture()
- self.useFixture(self.temp_dir_fixture)
-
- def test_remove_dir(self):
- rc = remove_dir(
- self.temp_dir_fixture.get_temp_dir(), as_root=False)
- self.assertEqual(rc, 0)
- self.assertFalse(
- os.path.exists(self.temp_dir_fixture.get_temp_dir()))
-
-
class TestUnpackBinaryTarball(TestCaseWithFixtures):
def setUp(self):