Merge lp:~lool/linaro-image-tools/temp-tarball into lp:linaro-image-tools/11.11

[Loïc Minier]

[Loïc Minier (lool)]

Fixes warnings during testsuite

[James Westby (james-w)]

Could you put the magic "tarball" string as a class variable or
something please?

Thanks,

James

review: Needs Fixing

[lp:~lool/linaro-image-tools/temp-tarball]

276. By Loïc Minier on 2011-02-01

Make names "tarball" and "tarball.gz" configurable and move mkdir() to setUp()
instead of __init__().

[James Westby (james-w)]

review: Approve

=== modified file 'linaro_media_create/tests/fixtures.py'
--- linaro_media_create/tests/fixtures.py	2011-01-28 19:50:48 +0000
+++ linaro_media_create/tests/fixtures.py	2011-02-01 16:11:02 +0000
@@ -44,19 +44,24 @@
 
 class CreateTarballFixture(object):
 
-    def __init__(self, dir):
-        self.dir = dir
-        self.tarball = os.path.join(self.dir, 'tarball.tar.gz')
+    def __init__(self, basedir, reldir='tarball', filename='tarball.tar.gz'):
+        self.basedir = basedir
+        self.reldir = reldir
+        self.tarball = os.path.join(self.basedir, filename)
 
     def setUp(self):
         # Create gzipped tar archive.
-        args = ['tar', '-czf', self.tarball, self.dir]
+        os.mkdir(os.path.join(self.basedir, reldir))
+        args = ['tar', '-C', self.basedir, '-czf', self.tarball, self.reldir]
         proc = subprocess.Popen(args)
         proc.wait()
 
     def tearDown(self):
         if os.path.exists(self.tarball):
             os.remove(self.tarball)
+        dir = os.path.join(self.basedir, subdir)
+        if os.path.exists(dir):
+            os.rmdir(dir)
 
     def get_tarball(self):
         return self.tarball