summaryrefslogtreecommitdiff
path: root/cleopatre/devkit
diff options
context:
space:
mode:
authorBelkadi & Save2012-12-17 11:41:48 +0100
committerYacine Belkadi2013-01-10 16:51:15 +0100
commit53b44cc9a7f9c68ce6b727a11e37d4359504e55e (patch)
tree82b3ca6edcfd4703901d13e8ab7420d70a448152 /cleopatre/devkit
parent84cb86755333b0e53f572034b972065061778305 (diff)
cleo/bundle_delivery: adapt to new bundle storage area layout, refs #3247
The bundle storage area has been re-organized: - the "SPC300" directory is gone - each project now has its own sub-directory Adapt bundle_delivery.py to these changes.
Diffstat (limited to 'cleopatre/devkit')
-rwxr-xr-xcleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/cleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py b/cleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py
index 7357fcf935..6ea7764684 100755
--- a/cleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py
+++ b/cleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py
@@ -66,6 +66,7 @@ class TestBundleStorage(unittest.TestCase):
def setUp(self):
self.temp_dir = tempfile.mkdtemp(prefix='test-bundle-delivery-')
+ os.mkdir(os.path.join(self.temp_dir, "av"))
def test_get_bundle(self):
b = BundleStorage(self.temp_dir)
@@ -89,21 +90,23 @@ class TestBundleStorage(unittest.TestCase):
expected_dir = "{0}_SPiDBundle_av-1.2.1".format(
datetime.date.today().strftime("%Y_%m_%d"))
- self.assertEqual([expected_dir], os.listdir(self.temp_dir))
- self.assertEqual(3,
- len(os.listdir(os.path.join(self.temp_dir, expected_dir))))
+ self.assertEqual(["av"], os.listdir(self.temp_dir))
+ self.assertEqual([expected_dir],
+ os.listdir(os.path.join(self.temp_dir, "av")))
+ self.assertEqual(
+ 3, len(os.listdir(os.path.join(self.temp_dir, "av", expected_dir))))
self.assertTrue(
filecmp.cmp("testfiles/SPiDBundle-av-1.2.1.tar.bz2",
- os.path.join(self.temp_dir, expected_dir,
+ os.path.join(self.temp_dir, "av", expected_dir,
"SPiDBundle-av-1.2.1.tar.bz2")))
self.assertTrue(
filecmp.cmp("testfiles/plc-with-traces.rom",
- os.path.join(self.temp_dir, expected_dir,
+ os.path.join(self.temp_dir, "av", expected_dir,
"plc-with-traces.rom")))
self.assertTrue(
filecmp.cmp("testfiles/SPiDBundle-av-1.2.0-av-1.2.1.diff",
os.path.join(
- self.temp_dir, expected_dir,
+ self.temp_dir, "av", expected_dir,
"SPiDBundle-av-1.2.0-av-1.2.1.diff")))
def tearDown(self):