11:45 a.m.
Repository: git://roadtrain.codethink.co.uk/baserock/morph
Branch: samthursfield/misc-1
Sha1: e176b1949c311b79eb2b4190fe5976c9497f12c0
Here are a few random cleanups, nothing of great importance.
Sam Thursfield (4):
Warn if creating an empty stratum
Display expected filename in "Failed to determine build system" error
ArtifactResolverTests: use keyword args for FakeStratumMorphology
Remove unused files in test/
morphlib/artifactresolver_tests.py | 77 ++++++++++++++++++++----------------
morphlib/builder2.py | 2 +
morphlib/morphologyfactory.py | 6 +-
tests/hello-chunk.tar.gz | Bin 12596 -> 0 bytes
tests/hello-stratum.morph | 10 -----
5 files changed, 48 insertions(+), 47 deletions(-)
delete mode 100644 tests/hello-chunk.tar.gz
delete mode 100644 tests/hello-stratum.morph
--
1.7.7.6
11:45 a.m.
New subject: [PATCH 1/4] Warn if creating an empty stratum
This is mostly useful for diagnosing Morph bugs. Currently empty strata
just cause confusing errors when building systems.
---
morphlib/builder2.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 672a08a..9d72938 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -441,6 +441,8 @@ class StratumBuilder(BuilderBase):
constituents = [dependency
for dependency in self.artifact.dependencies
if dependency.source.morphology['kind'] ==
'chunk']
+ if len(constituents) == 0:
+ logging.warning('Stratum %s is empty' % self.artifact.name)
# the only reason the StratumBuilder has to download chunks is to
# check for overlap now that strata are lists of chunks
with self.build_watch('check-chunks'):
--
1.7.7.6
5:45 a.m.
New subject: [PATCH 1/4] Warn if creating an empty stratum
On 08/29/2012 05:45 PM, Sam Thursfield wrote:
This is mostly useful for diagnosing Morph bugs. Currently empty
strata
just cause confusing errors when building systems.
---
morphlib/builder2.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 672a08a..9d72938 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -441,6 +441,8 @@ class StratumBuilder(BuilderBase):
constituents = [dependency
for dependency in self.artifact.dependencies
if dependency.source.morphology['kind'] ==
'chunk']
+ if len(constituents) == 0:
+ logging.warning('Stratum %s is empty' % self.artifact.name)
# the only reason the StratumBuilder has to download chunks is to
# check for overlap now that strata are lists of chunks
with self.build_watch('check-chunks'):
This should raise an error, not just warn. There's no reason to build a
system with empty strata.
Sam
11:45 a.m.
New subject: [PATCH 2/4] Display expected filename in "Failed to determine build system" error
This allows a few more diagnostics of what went wrong when the error
is inside the baserock:morphs repository.
---
morphlib/morphologyfactory.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py
index a4e7b4e..69b4750 100644
--- a/morphlib/morphologyfactory.py
+++ b/morphlib/morphologyfactory.py
@@ -22,10 +22,10 @@ class MorphologyFactoryError(cliapp.AppException):
class AutodetectError(MorphologyFactoryError):
- def __init__(self, repo_name, ref):
+ def __init__(self, repo_name, ref, filename):
MorphologyFactoryError.__init__(
self, "Failed to determine the build system of repo %s at "
- "ref %s" % (repo_name, ref))
+ "ref %s: was looking for %s" % (repo_name, ref, filename))
class NotcachedError(MorphologyFactoryError):
@@ -61,7 +61,7 @@ class MorphologyFactory(object):
if text is None:
bs = morphlib.buildsystem.detect_build_system(file_list)
if bs is None:
- raise AutodetectError(reponame, sha1)
+ raise AutodetectError(reponame, sha1, filename)
# TODO consider changing how morphs are located to be by morph
# name rather than filename, it would save creating a
# filename only to strip it back to its morph name again
--
1.7.7.6
11:45 a.m.
New subject: [PATCH 3/4] ArtifactResolverTests: use keyword args for FakeStratumMorphology
Helps avoid parameter-list-blindness when reading the testcases
---
morphlib/artifactresolver_tests.py | 77 ++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/morphlib/artifactresolver_tests.py b/morphlib/artifactresolver_tests.py
index 65a9be7..255379a 100644
--- a/morphlib/artifactresolver_tests.py
+++ b/morphlib/artifactresolver_tests.py
@@ -51,26 +51,26 @@ class FakeChunkMorphology(morphlib.morph2.Morphology):
class FakeStratumMorphology(morphlib.morph2.Morphology):
- def __init__(self, name, chunks_list=[], build_depends_list=[]):
- assert(isinstance(chunks_list, list))
- assert(isinstance(build_depends_list, list))
+ def __init__(self, name, chunks=[], build_depends=[]):
+ assert(isinstance(chunks, list))
+ assert(isinstance(build_depends, list))
- chunks = []
- for source_name, morph, repo, ref in chunks_list:
- chunks.append({
+ chunks_list = []
+ for source_name, morph, repo, ref in chunks:
+ chunks_list.append({
'name': source_name,
'morph': morph,
'repo': repo,
'ref': ref
})
- build_depends = []
- for morph, repo, ref in build_depends_list:
- build_depends.append({
+ build_depends_list = []
+ for morph, repo, ref in build_depends:
+ build_depends_list.append({
'morph': morph,
'repo': repo,
'ref': ref
})
- if chunks:
+ if chunks_list:
text = ('''
{
"name": "%s",
@@ -79,8 +79,8 @@ class FakeStratumMorphology(morphlib.morph2.Morphology):
"chunks": %s
}
''' % (name,
- json.dumps(build_depends),
- json.dumps(chunks)))
+ json.dumps(build_depends_list),
+ json.dumps(chunks_list)))
else:
text = ('''
{
@@ -89,7 +89,7 @@ class FakeStratumMorphology(morphlib.morph2.Morphology):
"build-depends": %s
}
''' % (name,
- json.dumps(build_depends)))
+ json.dumps(build_depends_list)))
self.builds_artifacts = [name]
morphlib.morph2.Morphology.__init__(self, text)
@@ -238,7 +238,7 @@ class ArtifactResolverTests(unittest.TestCase):
pool.add(chunk)
morph = FakeStratumMorphology(
- 'stratum', [('chunk', 'chunk', 'repo',
'ref')])
+ 'stratum', chunks=[('chunk', 'chunk', 'repo',
'ref')])
stratum = morphlib.source.Source(
'repo', 'ref', 'sha1', morph,
'stratum.morph')
pool.add(stratum)
@@ -266,7 +266,8 @@ class ArtifactResolverTests(unittest.TestCase):
pool.add(chunk)
morph = FakeStratumMorphology(
- 'stratum', [
+ 'stratum',
+ chunks=[
('chunk-devel', 'chunk', 'repo', 'ref'),
('chunk-runtime', 'chunk', 'repo',
'ref')
])
@@ -303,9 +304,8 @@ class ArtifactResolverTests(unittest.TestCase):
pool.add(chunk)
morph = FakeStratumMorphology(
- 'stratum', [
- ('chunk-runtime', 'chunk', 'repo',
'ref')
- ])
+ 'stratum',
+ chunks=[('chunk-runtime', 'chunk', 'repo',
'ref')])
stratum = morphlib.source.Source(
'repo', 'ref', 'sha1', morph,
'stratum.morph')
pool.add(stratum)
@@ -338,7 +338,8 @@ class ArtifactResolverTests(unittest.TestCase):
pool.add(bar_chunk)
morph = FakeStratumMorphology(
- 'stratum', [
+ 'stratum',
+ chunks=[
('foo', 'foo', 'repo', 'ref'),
('bar', 'bar', 'repo', 'ref')
])
@@ -375,7 +376,9 @@ class ArtifactResolverTests(unittest.TestCase):
pool.add(stratum1)
morph = FakeStratumMorphology(
- 'stratum2', [], [('stratum1', 'repo',
'ref')])
+ 'stratum2',
+ chunks=[],
+ build_depends=[('stratum1', 'repo', 'ref')])
stratum2 = morphlib.source.Source(
'repo', 'ref', 'sha1', morph,
'stratum2.morph')
pool.add(stratum2)
@@ -403,12 +406,12 @@ class ArtifactResolverTests(unittest.TestCase):
pool.add(stratum1)
morph = FakeStratumMorphology(
- 'stratum2', [
+ 'stratum2',
+ chunks=[
('chunk1', 'chunk1', 'repo',
'original/ref'),
('chunk2', 'chunk2', 'repo',
'original/ref')
- ], [
- ('stratum1', 'repo', 'original/ref')
- ])
+ ],
+ build_depends=[('stratum1', 'repo',
'original/ref')])
stratum2 = morphlib.source.Source(
'repo', 'original/ref', 'sha1', morph,
'stratum2.morph')
pool.add(stratum2)
@@ -483,7 +486,7 @@ class ArtifactResolverTests(unittest.TestCase):
pool.add(system)
morph = FakeStratumMorphology(
- 'stratum2', [], [('stratum1', 'repo',
'ref')])
+ 'stratum2', chunks=[], build_depends=[('stratum1',
'repo', 'ref')])
stratum2 = morphlib.source.Source(
'repo', 'ref', 'sha1', morph,
'stratum2.morph')
pool.add(stratum2)
@@ -597,9 +600,8 @@ class ArtifactResolverTests(unittest.TestCase):
pool.add(chunk)
morph = FakeStratumMorphology(
- 'stratum', [
- ('chunk-runtime', 'chunk', 'repo',
'ref')
- ])
+ 'stratum',
+ chunks=[('chunk-runtime', 'chunk', 'repo',
'ref')])
stratum = morphlib.source.Source(
'repo', 'ref', 'sha1', morph,
'stratum.morph')
pool.add(stratum)
@@ -612,13 +614,17 @@ class ArtifactResolverTests(unittest.TestCase):
pool = morphlib.sourcepool.SourcePool()
morph = FakeStratumMorphology(
- 'stratum1', [], [('stratum2', 'repo',
'original/ref')])
+ 'stratum1',
+ chunks=[],
+ build_depends=[('stratum2', 'repo',
'original/ref')])
stratum1 = morphlib.source.Source(
'repo', 'original/ref', 'sha1', morph,
'stratum1.morph')
pool.add(stratum1)
morph = FakeStratumMorphology(
- 'stratum2', [], [('stratum1', 'repo',
'original/ref')])
+ 'stratum2',
+ chunks=[],
+ build_depends=[('stratum1', 'repo',
'original/ref')])
stratum2 = morphlib.source.Source(
'repo', 'original/ref', 'sha1', morph,
'stratum2.morph')
pool.add(stratum2)
@@ -630,19 +636,22 @@ class ArtifactResolverTests(unittest.TestCase):
pool = morphlib.sourcepool.SourcePool()
morph = FakeStratumMorphology(
- 'stratum1', [
+ 'stratum1',
+ chunks=[
('chunk1', 'chunk1', 'repo',
'original/ref'),
('chunk2', 'chunk2', 'repo',
'original/ref')
- ], [])
+ ])
stratum1 = morphlib.source.Source(
'repo', 'original/ref', 'sha1', morph,
'stratum1.morph')
pool.add(stratum1)
morph = FakeStratumMorphology(
- 'stratum2', [
+ 'stratum2',
+ chunks=[
('chunk2', 'chunk2', 'repo',
'original/ref'),
('chunk1', 'chunk1', 'repo',
'original/ref')
- ], [('stratum1', 'repo', 'original/ref')])
+ ],
+ build_depends=[('stratum1', 'repo',
'original/ref')])
stratum2 = morphlib.source.Source(
'repo', 'original/ref', 'sha1', morph,
'stratum2.morph')
pool.add(stratum2)
--
1.7.7.6
11:45 a.m.
New subject: [PATCH 4/4] Remove unused files in test/
---
tests/hello-chunk.tar.gz | Bin 12596 -> 0 bytes
tests/hello-stratum.morph | 10 ----------
2 files changed, 0 insertions(+), 10 deletions(-)
delete mode 100644 tests/hello-chunk.tar.gz
delete mode 100644 tests/hello-stratum.morph
diff --git a/tests/hello-chunk.tar.gz b/tests/hello-chunk.tar.gz
deleted file mode 100644
index 91e273479ce099bc692c26c88d7e035f2d2b51cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12596
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�Fte)4b(KS8%m&kFc
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
M)|)#72SkMb2e#ivo&W#<
diff --git a/tests/hello-stratum.morph b/tests/hello-stratum.morph
deleted file mode 100644
index d5b9736..0000000
--- a/tests/hello-stratum.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "name": "hello",
- "kind": "stratum",
- "chunks": {
- "hello": {
- "repo": "hello",
- "ref": "master"
- }
- }
-}
--
1.7.7.6
5:27 a.m.
On 08/29/2012 05:45 PM, Sam Thursfield wrote:
Repository: git://roadtrain.codethink.co.uk/baserock/morph
Branch: samthursfield/misc-1
Sha1: e176b1949c311b79eb2b4190fe5976c9497f12c0
Here are a few random cleanups, nothing of great importance.
Sam Thursfield (4):
Warn if creating an empty stratum
Display expected filename in "Failed to determine build system" error
ArtifactResolverTests: use keyword args for FakeStratumMorphology
Remove unused files in test/
From looking at them, I think the changes proposed here are fine.
I'll
test them once the stratum triplets patch is merged.
- Jannis
--
Jannis Pohlmann
Senior Software Developer
Codethink Limited
http://codethink.co.uk
6:27 a.m.
On 08/29/2012 05:45 PM, Sam Thursfield wrote:
Repository: git://roadtrain.codethink.co.uk/baserock/morph
Branch: samthursfield/misc-1
Sha1: e176b1949c311b79eb2b4190fe5976c9497f12c0
Here are a few random cleanups, nothing of great importance.
Sam Thursfield (4):
Warn if creating an empty stratum
Display expected filename in "Failed to determine build system" error
ArtifactResolverTests: use keyword args for FakeStratumMorphology
Remove unused files in test/
Ok, all merged into master. I made a small change to the "Warn if
creating an empty stratum" commit to make it log an error instead of a
warning. The rest, however, remained untouched.
- Jannis
--
Jannis Pohlmann
Senior Software Developer
Codethink Limited
http://codethink.co.uk
3858
days inactive
3859
days old
7 comments
2 participants
participants (2)
-
Jannis Pohlmann -
Sam Thursfield