summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBelkadi & Save2012-12-14 18:30:53 +0100
committerYacine Belkadi2013-01-10 16:51:15 +0100
commit84cb86755333b0e53f572034b972065061778305 (patch)
tree5ae5a3f676aed3ff18c0ed7bc65a84f744f4aade
parent2a55ee7683c570ded25fafd5b4c771c0a51aab55 (diff)
cleo/{bundle_delivery,Makefile}: remove "spc300" from bundle archive name, refs #3247
-rw-r--r--cleopatre/Makefile2
-rwxr-xr-xcleopatre/bundle_delivery.py4
-rwxr-xr-xcleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py34
-rw-r--r--cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.0-av-1.2.1.diff (renamed from cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.0-av-1.2.1.diff)bin46607 -> 46467 bytes
-rw-r--r--cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.0.tar.bz2bin0 -> 24177 bytes
-rw-r--r--cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.1.tar.bz2bin0 -> 23651 bytes
-rw-r--r--cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.0.tar.bz2bin24190 -> 0 bytes
-rw-r--r--cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.1.tar.bz2bin23657 -> 0 bytes
8 files changed, 20 insertions, 20 deletions
diff --git a/cleopatre/Makefile b/cleopatre/Makefile
index fde28d8b88..e098f3b763 100644
--- a/cleopatre/Makefile
+++ b/cleopatre/Makefile
@@ -15,7 +15,7 @@ BUNDLE_VERSION=$(shell git describe --always 2>/dev/null)
LINUX_VERSION=2.6.25.10
UBOOT_VERSION=1.1.6
-BUNDLE_NAME=SPiDBundle-spc300-$(BUNDLE_VERSION)
+BUNDLE_NAME=SPiDBundle-$(BUNDLE_VERSION)
BUNDLE_UPPER_PATH=/tmp/$(BUNDLE_NAME)
BUNDLE_TMP=$(BUNDLE_UPPER_PATH)-tmp
diff --git a/cleopatre/bundle_delivery.py b/cleopatre/bundle_delivery.py
index 3f98b07d65..c9ef774cfe 100755
--- a/cleopatre/bundle_delivery.py
+++ b/cleopatre/bundle_delivery.py
@@ -25,9 +25,9 @@ BUNDLE_STORAGE_SPC300_BUNDLES_DIR = "SPC300/SPiDBundle"
# a bundle.
BUNDLE_STORAGE_BUNDLE_DIR_FMT = "{date}_SPiDBundle_{tagname}"
# In the bundle storage, the format of the filename of a bundle.
-BUNDLE_STORAGE_BUNDLE_FILE_FMT = "SPiDBundle-spc300-{tagname}.tar.bz2"
+BUNDLE_STORAGE_BUNDLE_FILE_FMT = "SPiDBundle-{tagname}.tar.bz2"
# The format of the filename of the resulting diff between two bundles.
-DIFF_FILE_FMT = "SPiDBundle-spc300-{tagname_from}-{tagname_to}.diff"
+DIFF_FILE_FMT = "SPiDBundle-{tagname_from}-{tagname_to}.diff"
# How to reach the git root directory from where this file is.
GIT_ROOT_RELATIVE_PATH = ".."
diff --git a/cleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py b/cleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py
index 0c184550a2..7357fcf935 100755
--- a/cleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py
+++ b/cleopatre/devkit/tests/bundle_delivery/test_bundle_delivery.py
@@ -23,16 +23,16 @@ class TestBundleDiff(unittest.TestCase):
self.assertTrue(file is None)
(tag, file) = b._id_tag_or_file(
- "testfiles/SPiDBundle-spc300-av-1.2.0.tar.bz2")
+ "testfiles/SPiDBundle-av-1.2.0.tar.bz2")
self.assertTrue(tag is not None)
- self.assertEqual(file, "testfiles/SPiDBundle-spc300-av-1.2.0.tar.bz2")
+ self.assertEqual(file, "testfiles/SPiDBundle-av-1.2.0.tar.bz2")
def test_gen_diff_file__two_tags(self):
b = BundleDiff(StubRepo(), StubBundleStorage())
diff_file = b.gen_diff_file("av-1.2.0", "av-1.2.1")
same = filecmp.cmp(
diff_file,
- "testfiles/SPiDBundle-spc300-av-1.2.0-av-1.2.1.diff")
+ "testfiles/SPiDBundle-av-1.2.0-av-1.2.1.diff")
os.remove(diff_file)
self.assertTrue(same)
@@ -41,7 +41,7 @@ class TestBundleDiff(unittest.TestCase):
diff_file = b.gen_diff_file(None, "av-1.2.1")
same = filecmp.cmp(
diff_file,
- "testfiles/SPiDBundle-spc300-av-1.2.0-av-1.2.1.diff")
+ "testfiles/SPiDBundle-av-1.2.0-av-1.2.1.diff")
os.remove(diff_file)
self.assertTrue(same)
@@ -55,8 +55,8 @@ class TestBundleDiff(unittest.TestCase):
def test_gen_diff_file__same_file(self):
b = BundleDiff(StubRepo(), StubBundleStorage())
diff_file = b.gen_diff_file(
- "testfiles/SPiDBundle-spc300-av-1.2.1.tar.bz2",
- "testfiles/SPiDBundle-spc300-av-1.2.1.tar.bz2")
+ "testfiles/SPiDBundle-av-1.2.1.tar.bz2",
+ "testfiles/SPiDBundle-av-1.2.1.tar.bz2")
diff_file_size = os.stat(diff_file).st_size
os.remove(diff_file)
self.assertEqual(diff_file_size, 0)
@@ -83,8 +83,8 @@ class TestBundleStorage(unittest.TestCase):
def test_put_bundle_files(self):
b = BundleStorage(self.temp_dir)
b.put_bundle_files(
- "testfiles/SPiDBundle-spc300-av-1.2.1.tar.bz2",
- "testfiles/SPiDBundle-spc300-av-1.2.0-av-1.2.1.diff",
+ "testfiles/SPiDBundle-av-1.2.1.tar.bz2",
+ "testfiles/SPiDBundle-av-1.2.0-av-1.2.1.diff",
"testfiles/plc-with-traces.rom")
expected_dir = "{0}_SPiDBundle_av-1.2.1".format(
datetime.date.today().strftime("%Y_%m_%d"))
@@ -93,18 +93,18 @@ class TestBundleStorage(unittest.TestCase):
self.assertEqual(3,
len(os.listdir(os.path.join(self.temp_dir, expected_dir))))
self.assertTrue(
- filecmp.cmp("testfiles/SPiDBundle-spc300-av-1.2.1.tar.bz2",
+ filecmp.cmp("testfiles/SPiDBundle-av-1.2.1.tar.bz2",
os.path.join(self.temp_dir, expected_dir,
- "SPiDBundle-spc300-av-1.2.1.tar.bz2")))
+ "SPiDBundle-av-1.2.1.tar.bz2")))
self.assertTrue(
filecmp.cmp("testfiles/plc-with-traces.rom",
os.path.join(self.temp_dir, expected_dir,
"plc-with-traces.rom")))
self.assertTrue(
- filecmp.cmp("testfiles/SPiDBundle-spc300-av-1.2.0-av-1.2.1.diff",
+ filecmp.cmp("testfiles/SPiDBundle-av-1.2.0-av-1.2.1.diff",
os.path.join(
self.temp_dir, expected_dir,
- "SPiDBundle-spc300-av-1.2.0-av-1.2.1.diff")))
+ "SPiDBundle-av-1.2.0-av-1.2.1.diff")))
def tearDown(self):
shutil.rmtree(self.temp_dir)
@@ -133,17 +133,17 @@ class TestTag(unittest.TestCase):
self.assertEqual(Tag.from_tagname("eoc-0.3-rc1-10"), None)
def test_from_filename(self):
- t = Tag.from_filename("SPiDBundle-spc300-av-1.1.2.tar.bz2")
+ t = Tag.from_filename("SPiDBundle-av-1.1.2.tar.bz2")
self.assertEqual(t.name, "av-1.1.2")
self.assertEqual(t.project, "av")
self.assertEqual(t.version, (1, 1, 2))
- t = Tag.from_filename("../SPiDBundle-spc300-av-1.1.2.tar.bz2")
+ t = Tag.from_filename("../SPiDBundle-av-1.1.2.tar.bz2")
self.assertEqual(t.name, "av-1.1.2")
self.assertEqual(t.project, "av")
self.assertEqual(t.version, (1, 1, 2))
- t = Tag.from_filename("SPiDBundle-spc300-av-1.1.9-3.tar.bz2")
+ t = Tag.from_filename("SPiDBundle-av-1.1.9-3.tar.bz2")
self.assertEqual(t.name, "av-1.1.9-3")
self.assertEqual(t.project, "av")
self.assertEqual(t.version, (1, 1, 9,"3"))
@@ -179,9 +179,9 @@ class StubBundleStorage:
def get_bundle(self, tag, dest_dir):
if (tag.name == "av-1.2.0"):
- bundle ="testfiles/SPiDBundle-spc300-av-1.2.0.tar.bz2"
+ bundle ="testfiles/SPiDBundle-av-1.2.0.tar.bz2"
elif (tag.name == "av-1.2.1"):
- bundle = "testfiles/SPiDBundle-spc300-av-1.2.1.tar.bz2"
+ bundle = "testfiles/SPiDBundle-av-1.2.1.tar.bz2"
else:
print tag.name
raise RuntimeError("unexpected test case")
diff --git a/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.0-av-1.2.1.diff b/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.0-av-1.2.1.diff
index d9ec3fbb59..7dd5770735 100644
--- a/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.0-av-1.2.1.diff
+++ b/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.0-av-1.2.1.diff
Binary files differ
diff --git a/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.0.tar.bz2 b/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.0.tar.bz2
new file mode 100644
index 0000000000..ed16a47b64
--- /dev/null
+++ b/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.0.tar.bz2
Binary files differ
diff --git a/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.1.tar.bz2 b/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.1.tar.bz2
new file mode 100644
index 0000000000..5802950433
--- /dev/null
+++ b/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-av-1.2.1.tar.bz2
Binary files differ
diff --git a/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.0.tar.bz2 b/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.0.tar.bz2
deleted file mode 100644
index 3dc1307e5d..0000000000
--- a/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.0.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.1.tar.bz2 b/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.1.tar.bz2
deleted file mode 100644
index 3dd0abd828..0000000000
--- a/cleopatre/devkit/tests/bundle_delivery/testfiles/SPiDBundle-spc300-av-1.2.1.tar.bz2
+++ /dev/null
Binary files differ