Merge lp:~gz/pyjuju/0.6_test_lsbrelease_backport into lp:pyjuju/0.6

[Martin Packman]

Backport of test suite only fix for 0.6 release.

See the original merge proposal for more details:

<https://code.launchpad.net/~clint-fewbar/juju/no-lsb-release/+merge/130929>

[Martin Packman (gz)]

Test suite passes with change.

review: Approve

=== modified file 'juju/charm/tests/test_directory.py'
--- juju/charm/tests/test_directory.py	2012-09-14 15:33:33 +0000
+++ juju/charm/tests/test_directory.py	2013-04-02 15:03:21 +0000
@@ -3,7 +3,6 @@
 import hashlib
 import inspect
 import shutil
-import tempfile
 import zipfile
 
 from juju.errors import CharmError, FileNotFound
@@ -111,12 +110,12 @@
     def test_make_archive(self):
         # make archive from sample directory
         directory = CharmDirectory(sample_directory)
-        f = tempfile.NamedTemporaryFile(suffix=".charm")
-        directory.make_archive(f.name)
+        f = self.makeFile(suffix=".charm")
+        directory.make_archive(f)
 
         # open archive in .zip-format and assert integrity
         from zipfile import ZipFile
-        zf = ZipFile(f.name)
+        zf = ZipFile(f)
         self.assertEqual(zf.testzip(), None)
 
         # assert included
@@ -212,7 +211,8 @@
 
     def test_internal_symlink(self):
         charm_path = self.copy_charm()
-        os.symlink("/etc/lsb-release", os.path.join(charm_path, "foobar"))
+        external_file = self.makeFile(content='baz')
+        os.symlink(external_file, os.path.join(charm_path, "foobar"))
 
         directory = CharmDirectory(charm_path)
         e = self.assertRaises(InvalidCharmFile, directory.as_bundle)
@@ -220,7 +220,8 @@
 
     def test_extract_symlink(self):
         charm_path = self.copy_charm()
-        os.symlink("/etc/lsb-release", os.path.join(charm_path, "foobar"))
+        external_file = self.makeFile(content='lorem ipsum')
+        os.symlink(external_file, os.path.join(charm_path, "foobar"))
 
         directory = CharmDirectory(charm_path)
         e = self.assertRaises(InvalidCharmFile, directory.as_bundle)