December 2014 - java-sig-commits - Fedora Mailing-Lists

by Michal Srb

commit 593bbf8a7259fac6eb16e5dc35c7fd8721c4e7b2 Author: Michal Srb <msrb(a)redhat.com> Date: Thu Dec 4 14:17:36 2014 +0100 [config] Update python/javapackages/common/config.py | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) --- diff --git a/python/javapackages/common/config.py b/python/javapackages/common/config.py index 43d2b77..172cff5 100644 --- a/python/javapackages/common/config.py +++ b/python/javapackages/common/config.py @@ -34,11 +34,7 @@ import os import json -# for maven.req/maven.prov -prov_artifacts_cache_f = "provided_artifacts.cache" -skip_artifacts_cache_f = "skipped_artifacts.cache" -prov_osgi_cache_f = "provided_osgi.cache" -# for osgi.req/osgi.prov +metadata_cache_f = "metadata.cache" osgi_cache_f = "osgi.cache"

9 years, 6 months

1
0
0 / 0

[javapackages] Reflect caching changes in RPM dep. generators

by Michal Srb

commit d900bcd1781979b8b56e32eceb12f7362f9cd46f Author: Michal Srb <msrb(a)redhat.com> Date: Thu Dec 4 14:16:10 2014 +0100 Reflect caching changes in RPM dep. generators depgenerators/maven.prov | 10 ++++--- depgenerators/maven.req | 65 +++++++++++++++------------------------------ depgenerators/osgi.prov | 4 +- depgenerators/osgi.req | 4 +- 4 files changed, 32 insertions(+), 51 deletions(-) --- diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov index df1e4ea..da68db1 100755 --- a/depgenerators/maven.prov +++ b/depgenerators/maven.prov @@ -38,6 +38,7 @@ import sys import traceback import logging from javapackages.metadata.metadata import Metadata +from javapackages.cache.metadata import MetadataCache from javapackages.common.util import kill_parent_process, init_rpmgen logging.basicConfig(level=logging.DEBUG) @@ -49,15 +50,16 @@ class TagBuilder: if filelist == None: filelist = sys.stdin paths = [line.rstrip() for line in filelist.readlines()] + cache = MetadataCache(rpmconf.cachedir, rpmconf.scl) for path in paths: - mdata = Metadata(path) + metadata = cache.get_metadata_for_path(path) provides = set() - for artifact in mdata.get_provided_artifacts(): + for artifact in metadata.artifacts: provides.add(artifact.get_rpm_str(namespace=artifact.namespace, pkgver=artifact.version)) # print OSGi provides from metadata - osgi_provides = mdata.get_osgi_provides() + osgi_provides = metadata.get_osgi_provides() for p in osgi_provides: provides.add(p.get_rpm_str()) _log.debug("metadata provides: %s", ", ".join(provides)) @@ -67,7 +69,7 @@ class TagBuilder: if __name__ == "__main__": try: - init_rpmgen(sys.argv) + rpmconf = init_rpmgen(sys.argv) builder = TagBuilder() except Exception: traceback.print_exc(file=sys.stderr) diff --git a/depgenerators/maven.req b/depgenerators/maven.req index f494bd8..4ec0a4d 100755 --- a/depgenerators/maven.req +++ b/depgenerators/maven.req @@ -42,6 +42,7 @@ from lxml import etree from javapackages.common.config import get_configs, get_buildroot from javapackages.common.util import kill_parent_process, init_rpmgen +from javapackages.cache.metadata import MetadataCache from javapackages.maven.pom import POM from javapackages.maven.artifact import Artifact from javapackages.metadata.metadata import Metadata @@ -58,44 +59,22 @@ class TagBuilder(object): filelist = sys.stdin paths = [line.rstrip() for line in filelist.readlines()] - self.config = self._get_config() - self.metadata_paths = None - self.provided_artifacts = [] - self.skipped_artifacts = [] - self.provided_osgi = {} - - if paths: - self.metadata_dir = os.path.dirname(paths[0]) - metadata_paths = None - metadata = None - - # get all provided artifacts - self.provided_artifacts = Metadata.read_provided_artifacts_from_cache(rpmconf.cachedir) - if self.provided_artifacts is None: - metadata = Metadata(self.metadata_paths or self._gather_metadata_files()) - self.provided_artifacts = metadata.write_provided_artifacts_to_cache(rpmconf.cachedir) or [] - - # get all skipped artifacts - self.skipped_artifacts = Metadata.read_skipped_artifacts_from_cache(rpmconf.cachedir) - if self.skipped_artifacts is None: - metadata = Metadata(self.metadata_paths or self._gather_metadata_files()) - self.skipped_artifacts = metadata.write_skipped_artifacts_to_cache(rpmconf.cachedir) or [] - - # get all provided OSGi bundles - self.provided_osgi = Metadata.read_provided_osgi_from_cache(rpmconf.cachedir) - if self.provided_osgi is None: - metadata = Metadata(self.metadata_paths or self._gather_metadata_files()) - self.provided_osgi = metadata.write_provided_osgi_to_cache(rpmconf.cachedir) or [] - - curr_metadata = Metadata(paths[0]) - self.print_requires(curr_metadata) - - # generate also R on plugins and extensions from POM file, but only - # if this is POM-only package and xmvn-resolve is installed - if XMvnResolve.is_available(): - if curr_metadata.contains_only_poms(): - self.print_pom_requires(curr_metadata) + cache = MetadataCache(rpmconf.cachedir, rpmconf.scl) + self.provided_artifacts = cache.get_provided_artifacts() + self.skipped_artifacts = cache.get_skipped_artifacts() + self.provided_osgi = cache.get_provided_osgi() + self.metadata_dir = os.path.dirname(paths[0]) + + for path in paths: + metadata = cache.get_metadata_for_path(path) + self.print_requires(metadata) + + # generate also R on plugins and extensions from POM file, but only + # if this is POM-only package and xmvn-resolve is installed + if XMvnResolve.is_available(): + if metadata.contains_only_poms(): + self.print_pom_requires(metadata) def print_pom_requires(self, metadata): @@ -103,7 +82,7 @@ class TagBuilder(object): Print Requires on plugins and extensions in POM files """ pom_paths = [] - for artifact in metadata.get_provided_artifacts(): + for artifact in metadata.artifacts: if artifact.path: pom_path = os.path.join(get_buildroot(), artifact.path[1:]) pom_paths.append(pom_path) @@ -113,8 +92,8 @@ class TagBuilder(object): for i, pom_path in enumerate(pom_paths): pom = POM(pom_path) self._generate_requires_from_pom(pom, - metadata.get_provided_artifacts()[i], - metadata.get_provided_artifacts()) + metadata.artifacts[i], + metadata.artifacts) def print_requires(self, metadata): """ @@ -143,7 +122,7 @@ class TagBuilder(object): subpkg_dep, pkgver = dependency.is_provided_by(self.provided_artifacts) if subpkg_dep: # check if dependency isn't provided by same metadata file - if not dependency.is_provided_by(metadata.get_provided_artifacts())[0]: + if not dependency.is_provided_by(metadata.artifacts)[0]: # requires on subpackages are always versioned rpmstr = dependency.get_rpm_str(namespace=dependency.namespace, compat=dependency.resolvedVersion, @@ -169,8 +148,8 @@ class TagBuilder(object): raise Exception(unknown_msg) if skipped_but_required: - skipped_msg = "Following artifacts were built " \ - "but are not being installed however other " \ + skipped_msg = "Following artifacts were built, " \ + "but are not being installed. However, other " \ "artifacts require them:\n" for skipped in skipped_but_required: required_by = self._find_what_requires(skipped) diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov index 5c64efd..666a514 100755 --- a/depgenerators/osgi.prov +++ b/depgenerators/osgi.prov @@ -35,7 +35,7 @@ import sys import os import traceback import logging -from javapackages.common.osgi import OSGiCache, check_path_in_metadata +from javapackages.cache.osgi import OSGiCache from javapackages.common.util import kill_parent_process, init_rpmgen logging.basicConfig(level=logging.DEBUG) @@ -58,7 +58,7 @@ class TagBuilder(object): # check if OSGi provides for this path were handled by metadata # if so, move on - if check_path_in_metadata(path, rpmconf.cachedir): + if cache.check_path_in_metadata(path): continue bundle = cache.get_bundle_for_path(path) diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req index 7797112..4a1d8f3 100755 --- a/depgenerators/osgi.req +++ b/depgenerators/osgi.req @@ -36,7 +36,7 @@ import pickle import os import traceback import logging -from javapackages.common.osgi import OSGiCache, check_path_in_metadata +from javapackages.cache.osgi import OSGiCache from javapackages.common.util import kill_parent_process, init_rpmgen logging.basicConfig(level=logging.DEBUG) @@ -60,7 +60,7 @@ class TagBuilder(object): # check if OSGi requires for this path were handled by metadata # if so, move on - if check_path_in_metadata(path, rpmconf.cachedir): + if cache.check_path_in_metadata(path): continue bundle = cache.get_bundle_for_path(path)

9 years, 6 months

1
0
0 / 0

[javapackages] [metadata] Changes for better usage in MetadataCache

by Michal Srb

commit f7becd179c0c219f44e59e6bf01d8c65510fbbb4 Author: Michal Srb <msrb(a)redhat.com> Date: Thu Dec 4 14:06:37 2014 +0100 [metadata] Changes for better usage in MetadataCache python/javapackages/metadata/metadata.py | 218 ++++++++++-------------------- 1 files changed, 72 insertions(+), 146 deletions(-) --- diff --git a/python/javapackages/metadata/metadata.py b/python/javapackages/metadata/metadata.py index a3a7530..33d67fe 100644 --- a/python/javapackages/metadata/metadata.py +++ b/python/javapackages/metadata/metadata.py @@ -37,20 +37,15 @@ import gzip import logging import os.path import xml -import pickle from javapackages.metadata.artifact import MetadataArtifact from javapackages.metadata.dependency import MetadataDependency from javapackages.metadata.skippedartifact import MetadataSkippedArtifact -from javapackages.metadata.exclusion import MetadataExclusion -from javapackages.common.osgi import OSGiRequire, OSGiBundle -import javapackages.common.config as config import javapackages.metadata.pyxbmetadata as m import pyxb - class MetadataLoadingException(Exception): pass @@ -62,122 +57,91 @@ class MetadataInvalidException(Exception): class Metadata(object): def __init__(self, path): - if type(path) == list: - self.__paths = path - else: - self.__paths = [path] - self.__metadata = [] - for p in self.__paths: - try: - self.__load_metadata(p) - except (pyxb.UnrecognizedContentError, - pyxb.UnrecognizedDOMRootNodeError, - xml.sax.SAXParseException) as e: - logging.warning("Failed to parse metadata {path}: {e}" - .format(path=path, - e=e)) - if len(self.__metadata) == 0: - raise MetadataInvalidException("None of metadata paths could be parsed") - - - def __load_metadata(self, metadata_path): + self._path = path + self.artifacts = [] + self.skipped_artifacts = [] + self.properties = {} + + try: + metadata = self._load_metadata(self._path) + except (pyxb.UnrecognizedContentError, + pyxb.UnrecognizedDOMRootNodeError, + xml.sax.SAXParseException) as e: + logging.warning("Failed to parse metadata {path}: {e}" + .format(path=path, e=e)) + raise MetadataLoadingException() + + self.artifacts = self._read_artifacts(metadata) + self.skipped_artifacts = self._read_skipped_artifacts(metadata) + self.properties = self._read_properties(metadata) + + def _load_metadata(self, metadata_path): with open(metadata_path, 'rb') as f: try: gzf = gzip.GzipFile(os.path.basename(metadata_path), - 'rb', - fileobj=f) + 'rb', fileobj=f) data = gzf.read() except IOError: # not a compressed metadata, just rewind and read the data f.seek(0) data = f.read() + return m.CreateFromDocument(data) - self.__metadata.append(m.CreateFromDocument(data)) - - def get_provided_artifacts(self): - """Returns list of Artifact provided by given metadata.""" - + def _read_artifacts(self, metadata): artifacts = [] - for metadata in self.__metadata: - if metadata.artifacts and metadata.artifacts.artifact: - for a in metadata.artifacts.artifact: - artifact = MetadataArtifact.from_metadata(a) - if not artifact.version: - raise MetadataInvalidException("Artifact {a} does not have version in maven provides".format(a=artifact)) - artifacts.append(artifact) - return artifacts - - - def get_required_artifacts(self): - """Returns list of Artifact required by given metadata.""" - artifacts = set() - for metadata in self.__metadata: + if metadata.artifacts and metadata.artifacts.artifact: for a in metadata.artifacts.artifact: - if not a.dependencies: - continue - - for dep in a.dependencies.dependency: - artifacts.add(MetadataDependency.from_metadata(dep)) - - return list(artifacts) + artifact = MetadataArtifact.from_metadata(a) + if not artifact.version: + raise MetadataInvalidException("Artifact {a} does not have version in maven provides".format(a=artifact)) + artifacts.append(artifact) + return artifacts - def get_skipped_artifacts(self): - """Returns list of Artifact that were build but not installed""" - artifacts = set() - for metadata in self.__metadata: - if not metadata.skippedArtifacts: - continue - for dep in metadata.skippedArtifacts.skippedArtifact: - artifact = MetadataSkippedArtifact.from_metadata(dep) - artifacts.add(artifact) + def _read_skipped_artifacts(self, metadata): + artifacts = [] + if metadata.skippedArtifacts and metadata.skippedArtifacts.skippedArtifact: + for a in metadata.skippedArtifacts.skippedArtifact: + artifact = MetadataSkippedArtifact.from_metadata(a) + artifacts.append(artifact) return list(artifacts) - def get_excluded_artifacts(self): - """Returns list of Artifacts that should be skipped for requires""" - artifacts = set() - for metadata in self.__metadata: - for a in metadata.artifacts.artifact: - if not a.dependencies: - continue - - for dep in a.dependencies.dependency: - if not dep.exclusions: - continue + def _read_properties(self, metadata): + properties = {} + if hasattr(metadata, 'properties') and metadata.properties: + properties = dict((prop.tagName, prop.firstChild.value) + for prop in metadata.properties.wildcardElements()) + return properties - for exclusion in dep.exclusions.exclusion: - artifact = MetadataExclusion.from_metadata(exclusion) - artifacts.add(artifact) - return list(artifacts) + def get_required_artifacts(self): + """Returns list of Artifact required by given metadata.""" + dependencies = set() + for artifact in self.artifacts: + for dependency in artifact.dependencies: + dependencies.add(dependency) + return list(dependencies) def get_java_requires(self): """Returns JVM version required by metadata or None""" - for metadata in self.__metadata: - if not metadata.properties: - return None - for prop in metadata.properties.wildcardElements(): - if prop.tagName == u'requiresJava': - return prop.firstChild.value + try: + return self.properties[u'requiresJava'] + except KeyError: + pass return None def get_java_devel_requires(self): """Returns JVM development version required by metadata or None""" - for metadata in self.__metadata: - if not metadata.properties: - return None - for prop in metadata.properties.wildcardElements(): - if prop.tagName == u'requiresJavaDevel': - return prop.firstChild.value + try: + return self.properties[u'requiresJavaDevel'] + except KeyError: + pass return None def get_osgi_provides(self): bundles = [] - for metadata in self.__metadata: - if metadata.artifacts and metadata.artifacts.artifact: - for a in metadata.artifacts.artifact: - artifact = MetadataArtifact.from_metadata(a) - bundle = artifact.get_osgi_bundle() - if bundle: - bundles.append(bundle) + for artifact in self.artifacts: + bundle = artifact.get_osgi_bundle() + if bundle: + bundles.append(bundle) return bundles def get_osgi_requires(self): @@ -189,58 +153,20 @@ class Metadata(object): def contains_only_poms(self): """Check if metadata file contains only POM file(s)""" - for artifact in self.get_provided_artifacts(): + for artifact in self.artifacts: if artifact.extension != "pom": return False return True - def write_provided_artifacts_to_cache(self, cachedir): - cachefile = os.path.join(cachedir, config.prov_artifacts_cache_f) - return self._write_cache_file(cachefile, self.get_provided_artifacts()) - - @staticmethod - def read_provided_artifacts_from_cache(cachedir): - cachefile = os.path.join(cachedir, config.prov_artifacts_cache_f) - return Metadata._read_cache_file(cachefile) - - def write_skipped_artifacts_to_cache(self, cachedir): - cachefile = os.path.join(cachedir, config.skip_artifacts_cache_f) - return self._write_cache_file(cachefile, self.get_skipped_artifacts()) - - @staticmethod - def read_skipped_artifacts_from_cache(cachedir): - cachefile = os.path.join(cachedir, config.skip_artifacts_cache_f) - return Metadata._read_cache_file(cachefile) - - def write_provided_osgi_to_cache(self, cachedir): - cachefile = os.path.join(cachedir, config.prov_osgi_cache_f) - return self._write_cache_file(cachefile, self.get_osgi_provides()) - - @staticmethod - def read_provided_osgi_from_cache(cachedir): - cachefile = os.path.join(cachedir, config.prov_osgi_cache_f) - return Metadata._read_cache_file(cachefile) - - def _write_cache_file(self, cachefile, content): - try: - cachefile = open(cachefile, 'wb') - cache = (os.getppid(), content) - pickle.dump(cache, cachefile) - cachefile.close() - except IOError: - return None - return content - - @staticmethod - def _read_cache_file(cachefile): - try: - cachefile = open(cachefile, 'rb') - cache = pickle.load(cachefile) - cachefile.close() - # check if the cache was most likely created during current build - if cache[0] != os.getppid(): - logging.warning("Cache is outdated, skipping") - return None - except IOError: - return None - return cache[1] + def get_artifact_for_path(self, path, can_be_dir=False): + path = os.path.abspath(path) + for artifact in self.artifacts: + artifact_path = artifact.get_buildroot_path() + if can_be_dir: + # artifact_path can be a directory + if path.startswith(artifact_path): + return artifact + else: + if path == artifact_path: + return artifact + return None

9 years, 6 months

1
0
0 / 0

[javapackages] Move all caching related code to separate module, introduce MetadataCache class

by Michal Srb

commit d2276cf0c8cac90934d4588d633cfdebf8244b4f Author: Michal Srb <msrb(a)redhat.com> Date: Thu Dec 4 14:03:13 2014 +0100 Move all caching related code to separate module, introduce MetadataCache class python/javapackages/cache/cache.py | 55 +++++++++++++++ python/javapackages/cache/metadata.py | 69 +++++++++++++++++++ python/javapackages/cache/osgi.py | 99 ++++++++++++++++++++++++++++ python/javapackages/common/osgi.py | 117 --------------------------------- 4 files changed, 223 insertions(+), 117 deletions(-) --- diff --git a/python/javapackages/cache/__init__.py b/python/javapackages/cache/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/python/javapackages/cache/cache.py b/python/javapackages/cache/cache.py new file mode 100644 index 0000000..87f2e23 --- /dev/null +++ b/python/javapackages/cache/cache.py @@ -0,0 +1,55 @@ +import os +import logging +import pickle +import javapackages.common.config as config + + +class Cache(object): + def __init__(self, cachedir, scl=None): + self._cachedir = cachedir + self._scl = scl + + def _process_buildroot(self): + cache = {} + # TODO: implement in subclass + return cache + + def _find_paths(self): + buildroot = config.get_buildroot() + paths = [] + for dirpath, _, filenames in os.walk(buildroot): + for filename in filenames: + fpath = os.path.abspath(os.path.join(dirpath, filename)) + if self._check_path(fpath): + paths.append(fpath) + return paths + + def _check_path(self, path): + # TODO: implement in subclass + return False + + def _read_cache(self): + try: + cachepath = os.path.join(self._cachedir, self._config_name) + cachefile = open(cachepath, 'rb') + ppid, cache = pickle.load(cachefile) + cachefile.close() + # check if the cache was most likely created during current build + if ppid != os.getppid(): + logging.warning("Cache in {path} is outdated, skipping" + .format(path=cachepath)) + return None + except IOError: + return None + return cache + + def _write_cache(self, cache): + try: + cachefile = open(os.path.join(self._cachedir, + self._config_name), 'wb') + content = (os.getppid(), cache) + pickle.dump(content, cachefile) + cachefile.close() + except IOError: + return None + return cache diff --git a/python/javapackages/cache/metadata.py b/python/javapackages/cache/metadata.py new file mode 100644 index 0000000..362ac2d --- /dev/null +++ b/python/javapackages/cache/metadata.py @@ -0,0 +1,69 @@ +import javapackages.common.config as config +from javapackages.metadata.metadata import Metadata, MetadataLoadingException +from javapackages.cache.cache import Cache + + +class MetadataCache(Cache): + def __init__(self, cachedir, scl=None): + self._cachedir = cachedir + self._scl = scl + self._config_name = config.metadata_cache_f + self._cache = self._read_cache() + + if self._cache is None: + self._cache = self._process_buildroot() + self._write_cache(self._cache) + + def _process_buildroot(self): + # "path: Metadata" mapping + cache = {} + + metadata_paths = self._find_paths() + for path in metadata_paths: + try: + metadata = Metadata(path) + if metadata: + cache.update({path: metadata}) + except MetadataLoadingException: + continue + + return cache + + def _check_path(self, path): + # TODO + if "/usr/share/maven-metadata/" in path and path.endswith(".xml"): + return True + return False + + def get_artifact_for_path(self, path, can_be_dir=False): + for metadata in self._cache: + artifact = metadata.get_artifact_for_path(path, + can_be_dir=can_be_dir) + if artifact: + return artifact + return None + + def get_metadata_for_path(self, path): + try: + return self._cache[path] + except KeyError: + pass + return None + + def get_provided_artifacts(self): + artifacts = [] + for metadata in self._cache.values(): + artifacts.extend(metadata.artifacts) + return artifacts + + def get_skipped_artifacts(self): + artifacts = [] + for metadata in self._cache.values(): + artifacts.extend(metadata.skipped_artifacts) + return artifacts + + def get_provided_osgi(self): + bundles = [] + for metadata in self._cache.values(): + bundles += metadata.get_osgi_provides() + return bundles diff --git a/python/javapackages/cache/osgi.py b/python/javapackages/cache/osgi.py new file mode 100644 index 0000000..af1fde3 --- /dev/null +++ b/python/javapackages/cache/osgi.py @@ -0,0 +1,99 @@ +#!/usr/bin/python +# Copyright (c) 2014, Red Hat, Inc. +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the Red Hat nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Authors: Alexander Kurtakov <akurtako(a)redhat.com> +# Michal Srb <msrb(a)redhat.com> + +import os + +import javapackages.common.config as config +from javapackages.common.osgi import OSGiBundle +from javapackages.cache.cache import Cache +from javapackages.cache.metadata import MetadataCache + + +class OSGiCache(Cache): + + def __init__(self, cachedir, scl=None): + self._cachedir = cachedir + self._scl = scl + self._config_name = config.osgi_cache_f + self._cache = self._read_cache() + self._metadata_cache = MetadataCache(cachedir, scl) + + if self._cache is None: + self._cache = self._process_buildroot() + self._write_cache(self._cache) + + def get_bundle_for_path(self, path): + try: + return self._cache[path] + except KeyError: + pass + return None + + def get_bundle(self, name): + for bundle in self._cache.values(): + if bundle == name: + return bundle + return None + + def _process_buildroot(self): + # "path: OSGiBundle" mapping + cache = {} + + bundle_paths = self._find_paths() + for path in bundle_paths: + bundle = OSGiBundle.from_manifest(path) + if bundle: + cache.update({path: bundle}) + + return cache + + def _check_path(self, path): + if os.path.islink(path): + return False + if path.endswith(".jar"): + return True + if path.endswith("/MANIFEST.MF"): + # who knows where the manifest can be in buildroot. + # this is an attempt to identify only MANIFEST.MF files + # which are in %{_datadir} or %{_prefix}/lib + if "/usr/share/" in path or "/usr/lib" in path: + return True + return False + + def check_path_in_metadata(self, path): + artifact = self._metadata_cache.get_artifact_for_path(path, + can_be_dir=True) + if artifact and artifact.has_osgi_information(): + return True + return False diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py index 541bc03..73ea210 100644 --- a/python/javapackages/common/osgi.py +++ b/python/javapackages/common/osgi.py @@ -32,11 +32,8 @@ # Authors: Alexander Kurtakov <akurtako(a)redhat.com> # Michal Srb <msrb(a)redhat.com> -import os -import pickle import re -import javapackages.common.config as config from javapackages.common.manifest import Manifest @@ -168,117 +165,3 @@ class OSGiBundle(object): d="-" if self.namespace else "", bundle=self.bundle, version=version or self.version) - - -def check_path_in_metadata(path, cachedir_path): - buildroot = config.get_buildroot() - - from javapackages.metadata.metadata import Metadata, MetadataInvalidException - artifacts = Metadata.read_provided_artifacts_from_cache(cachedir_path) - if artifacts is None: - artifacts = [] - metadata_paths = [] - for dirpath, dirnames, filenames in os.walk(buildroot): - for filename in filenames: - fpath = os.path.abspath(os.path.join(dirpath, filename)) - # FIXME: add path to metadata directory to config file? - if "/maven-metadata/" in fpath: - metadata_paths.append(fpath) - try: - mdata = Metadata(metadata_paths) - artifacts = mdata.write_provided_artifacts_to_cache(cachedir_path) - except MetadataInvalidException: - pass - - for a in artifacts: - path = os.path.abspath(path) - if path.startswith(buildroot): - path = path[len(buildroot):] - path = os.path.join('/', path) - if a.path and a.has_osgi_information(): - if (os.path.abspath(a.path) == path or - (path.startswith(os.path.abspath(a.path)) and - os.path.realpath(buildroot + path))): - return True - return False - - -class OSGiCache(object): - - def __init__(self, cachedir, scl=None): - self._cachedir = cachedir - self._cache = self._read_osgi_cache() - self._scl = scl - - if self._cache is None: - cache = self._process_osgi_in_buildroot() - self._write_osgi_cache(cache) - self._cache = cache - - def get_bundle_for_path(self, path): - try: - return self._cache[path] - except KeyError: - pass - return None - - def get_bundle(self, name): - for bundle in self._cache.values(): - if bundle == name: - return bundle - return None - - def _process_osgi_in_buildroot(self): - # "path: OSGiBundle" mapping - cache = {} - - bundle_paths = self._find_possible_bundles() - for path in bundle_paths: - bundle = OSGiBundle.from_manifest(path) - if bundle: - cache.update({path: bundle}) - - return cache - - def _find_possible_bundles(self): - buildroot = config.get_buildroot() - paths = [] - for dirpath, _, filenames in os.walk(buildroot): - for filename in filenames: - fpath = os.path.abspath(os.path.join(dirpath, filename)) - if self._check_path(fpath): - paths.append(fpath) - return paths - - def _check_path(self, path): - if os.path.islink(path): - return False - if path.endswith(".jar"): - return True - if path.endswith("/MANIFEST.MF"): - # who knows where the manifest can be in buildroot. - # this is an attempt to identify only MANIFEST.MF files - # which are in %{_datadir} or %{_prefix}/lib - if "/usr/share/" in path or "/usr/lib" in path: - return True - return False - - def _read_osgi_cache(self): - try: - cachefile = open(os.path.join(self._cachedir, - config.osgi_cache_f), 'rb') - cache = pickle.load(cachefile) - cachefile.close() - except IOError: - return None - return cache - - def _write_osgi_cache(self, cache): - try: - cachefile = open(os.path.join(self._cachedir, - config.osgi_cache_f), 'wb') - pickle.dump(cache, cachefile) - cachefile.close() - except IOError: - return None - return cache

9 years, 6 months

1
0
0 / 0

[javapackages] [test] Fix tests for maven.{req, prov}

by Michal Srb

commit 7534ca01a08fa27a755e066f59d39a7e6ffd55b9 Author: Michal Srb <msrb(a)redhat.com> Date: Thu Dec 4 14:00:27 2014 +0100 [test] Fix tests for maven.{req,prov} test/maven_prov_test.py | 71 ++++++++++++++++++++--------------------- test/maven_req_test.py | 81 +++++++++++++++++++++------------------------- test/test_common.py | 70 +++++++++++++++++++--------------------- 3 files changed, 105 insertions(+), 117 deletions(-) --- diff --git a/test/maven_prov_test.py b/test/maven_prov_test.py index 98d6044..5445312 100644 --- a/test/maven_prov_test.py +++ b/test/maven_prov_test.py @@ -1,12 +1,11 @@ -import os -import sys import unittest from test_common import * + class TestMavenProv(unittest.TestCase): - @mavenprov(["simple.xml"]) + @mavenprov(["simple/buildroot/usr/share/maven-metadata/simple.xml"]) def test_simple(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -14,11 +13,11 @@ class TestMavenProv(unittest.TestCase): assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0", sout) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:pom:1.0) = 1.0", sout) - @mavenprov(["invalid.xml"]) + @mavenprov(["invalid/buildroot/usr/share/maven-metadata/invalid.xml"]) def test_invalid(self, stdout, stderr, return_value): self.assertNotEqual(return_value, 0) - @mavenprov(["not_xml.xml"]) + @mavenprov(["notxml/buildroot/usr/share/maven-metadata/not_xml.xml"]) def test_not_xml(self, stdout, stderr, return_value): self.assertNotEqual(return_value, 0) @@ -26,7 +25,7 @@ class TestMavenProv(unittest.TestCase): def test_nonexistent(self, stdout, stderr, return_value): self.assertNotEqual(return_value, 0) - @mavenprov(["single_ns.xml"]) + @mavenprov(["single_ns/buildroot/usr/share/maven-metadata/single_ns.xml"]) def test_single_ns(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -36,7 +35,7 @@ class TestMavenProv(unittest.TestCase): assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:1.0) = 9.1.1.b60.25.p2", sout) assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:pom:1.0) = 9.1.1.b60.25.p2", sout) - @mavenprov(["multi_ns.xml"]) + @mavenprov(["multi_ns/buildroot/usr/share/maven-metadata/multi_ns.xml"]) def test_multi_ns(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -46,25 +45,25 @@ class TestMavenProv(unittest.TestCase): assertIn(self, "ns2-mvn(org.mortbay.jetty:jsp-2.1-glassfish:1.0) = 9.1.1.b60.25.p2", sout) assertIn(self, "ns2-mvn(org.mortbay.jetty:jsp-2.1-glassfish:pom:1.0) = 9.1.1.b60.25.p2", sout) - @mavenprov(["no_version.xml"]) - def test_no_version(self, stdout, stderr, return_value): - self.assertNotEqual(return_value, 0) - - @mavenprov(["simple.xml", "simple2.xml"]) - def test_more_files(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] - self.assertEqual(len(sout), 4) - assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0", sout) - assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:pom:1.0) = 1.0", sout) - assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:6.0.18) = 9.1.1.b60.25.p2", sout) - assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:pom:6.0.18) = 9.1.1.b60.25.p2", sout) - - @mavenprov(["two_in_one.xml"]) - def test_two_in_one(self, stdout, stderr, return_value): - self.assertNotEqual(return_value, 0) - - @mavenprov(["non_compat.xml"]) + #@mavenprov(["no_version.xml"]) + #def test_no_version(self, stdout, stderr, return_value): + # self.assertNotEqual(return_value, 0) + + #@mavenprov(["simple.xml", "simple2.xml"]) + #def test_more_files(self, stdout, stderr, return_value): + # self.assertEqual(return_value, 0, stderr) + # sout = [x for x in stdout.split('\n') if x] + # self.assertEqual(len(sout), 4) + # assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0", sout) + # assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:pom:1.0) = 1.0", sout) + # assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:6.0.18) = 9.1.1.b60.25.p2", sout) + # assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:pom:6.0.18) = 9.1.1.b60.25.p2", sout) + + #@mavenprov(["two_in_one.xml"]) + #def test_two_in_one(self, stdout, stderr, return_value): + # self.assertNotEqual(return_value, 0) + + @mavenprov(["non_compat/buildroot/usr/share/maven-metadata/non_compat.xml"]) def test_non_compat(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -72,42 +71,42 @@ class TestMavenProv(unittest.TestCase): assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory) = 1.0", sout) assertIn(self, "ns-mvn(org.codehaus.plexus:plexus-ant-factory:pom:) = 1.0", sout) - @mavenprov(["extension1.xml"]) + @mavenprov(["extension1/buildroot/usr/share/maven-metadata/extension1.xml"]) def test_extension1(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] self.assertEqual(len(sout), 1) assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:war:6.0.18) = 9.1.1.B60.25.p2", sout) - @mavenprov(["extension2.xml"]) + @mavenprov(["extension2/buildroot/usr/share/maven-metadata/extension2.xml"]) def test_extension2(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] self.assertEqual(len(sout), 1) assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:6.0.18) = 9.1.1.B60.25.p2", sout) - @mavenprov(["pom_extension.xml"]) - def test__pom_extension(self, stdout, stderr, return_value): + @mavenprov(["pom_extension/buildroot/usr/share/maven-metadata/pom_extension.xml"]) + def test_pom_extension(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] self.assertEqual(len(sout), 1) assertIn(self, "ns-mvn(org.mortbay.jetty:jsp-2.1-glassfish:pom:) = 6.0.18", sout) - @mavenprov(["pom_namespace.xml"]) + @mavenprov(["pom_namespace/buildroot/usr/share/maven-metadata/pom_namespace.xml"]) def test_namespace_rhbz1017271(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] self.assertEqual(len(sout), 1) assertIn(self, "maven31-mvn(org.apache.maven:apache-maven:pom:) = 3.1.1", sout) - @mavenprov(["pom_compat.xml"]) + @mavenprov(["pom_compat/buildroot/usr/share/maven-metadata/pom_compat.xml"]) def test_compat_version_in_artifact(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] self.assertEqual(len(sout), 1) assertIn(self, "mvn(org.apache.maven:apache-maven:pom:3.1.1) = 3.1.1", sout) - @mavenprov(["alias.xml"]) + @mavenprov(["alias/buildroot/usr/share/maven-metadata/alias.xml"]) def test_alias(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -115,7 +114,7 @@ class TestMavenProv(unittest.TestCase): assertIn(self, "mvn(jakarta-regexp:jakarta-regexp:pom:) = 1.0", sout) assertIn(self, "mvn(regexp:regexp:pom:) = 1.0", sout) - @mavenprov(["alias2.xml"]) + @mavenprov(["alias2/buildroot/usr/share/maven-metadata/alias2.xml"]) def test_alias2(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -125,7 +124,7 @@ class TestMavenProv(unittest.TestCase): assertIn(self, "mvn(regexp:regexp:pom:) = 1.0", sout) assertIn(self, "mvn(regexp:regexp) = 1.0", sout) - @mavenprov(["compat_alias.xml"]) + @mavenprov(["compat_alias/buildroot/usr/share/maven-metadata/compat_alias.xml"]) def test_compat_alias(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -135,7 +134,7 @@ class TestMavenProv(unittest.TestCase): assertIn(self, "mvn(regexp:regexp:pom:1.1) = 1.0", sout) assertIn(self, "mvn(regexp:regexp:pom:1.1.1) = 1.0", sout) - @mavenprov(["jar_extension.xml"]) + @mavenprov(["jar_extension/buildroot/usr/share/maven-metadata/jar_extension.xml"]) def test_jar_extension(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] diff --git a/test/maven_req_test.py b/test/maven_req_test.py index d1c4ec8..a4424c7 100644 --- a/test/maven_req_test.py +++ b/test/maven_req_test.py @@ -6,25 +6,19 @@ from test_common import mavenreq, assertIn class TestMavenReq(unittest.TestCase): - def tearDown(self): - try: - shutil.rmtree("/tmp/.javapackages_cache/") - except OSError: - pass - - @mavenreq(["invalid.xml"]) - def test_invalid(self, stdout, stderr, return_value): - self.assertNotEqual(return_value, 0) + #@mavenreq(["invalid.xml"]) + #def test_invalid(self, stdout, stderr, return_value): + # self.assertNotEqual(return_value, 0) - @mavenreq(["not_xml.xml"]) - def test_not_xml(self, stdout, stderr, return_value): - self.assertNotEqual(return_value, 0) + #@mavenreq(["not_xml.xml"]) + #def test_not_xml(self, stdout, stderr, return_value): + # self.assertNotEqual(return_value, 0) - @mavenreq(["nonexistent_file_blablabla"]) - def test_nonexistent(self, stdout, stderr, return_value): - self.assertNotEqual(return_value, 0) + #@mavenreq(["nonexistent_file_blablabla"]) + #def test_nonexistent(self, stdout, stderr, return_value): + # self.assertNotEqual(return_value, 0) - @mavenreq(["require1/require.xml"]) + @mavenreq(["require1/buildroot/usr/share/maven-metadata/require.xml"]) def test_require1(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -32,7 +26,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven:maven-project)") self.assertEqual(set(want), set(sout)) - @mavenreq(["require-java/require.xml"]) + @mavenreq(["require-java/buildroot/usr/share/maven-metadata/require.xml"]) def test_require_java(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -40,7 +34,7 @@ class TestMavenReq(unittest.TestCase): "java-headless >= 1:1.6") self.assertEqual(set(want), set(sout)) - @mavenreq(["require-java-devel/require.xml"]) + @mavenreq(["require-java-devel/buildroot/usr/share/maven-metadata/require.xml"]) def test_require_java_devel(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -48,7 +42,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven:maven-project)", "java-devel >= 1:1.6") self.assertEqual(set(want), set(sout)) - @mavenreq(["require-java-both/require.xml"]) + @mavenreq(["require-java-both/buildroot/usr/share/maven-metadata/require.xml"]) def test_require_java_both(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -56,7 +50,7 @@ class TestMavenReq(unittest.TestCase): "java-headless >= 1:1.6", "java-devel >= 1:1.6") self.assertEqual(set(want), set(sout)) - @mavenreq(["require_parent/require.xml"]) + @mavenreq(["require_parent/buildroot/usr/share/maven-metadata/require.xml"]) def test_require_parent(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -64,7 +58,7 @@ class TestMavenReq(unittest.TestCase): "ns-mvn(org.codehaus.plexus:plexus-ant-factory)") self.assertEqual(set(want), set(sout)) - @mavenreq(["require_multi/require.xml"]) + @mavenreq(["require_multi/buildroot/usr/share/maven-metadata/require.xml"]) def test_require_multi(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -73,7 +67,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)") self.assertEqual(set(want), set(sout)) - @mavenreq(["require_multi_namespaces/require.xml"]) + @mavenreq(["require_multi_namespaces/buildroot/usr/share/maven-metadata/require.xml"]) def test_require_multi_namespace(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -82,7 +76,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)") self.assertEqual(set(want), set(sout)) - @mavenreq(["require_multi_versioned/require.xml"]) + @mavenreq(["require_multi_versioned/buildroot/usr/share/maven-metadata/require.xml"]) def test_require_multi_versioned(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -94,8 +88,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven.plugins:maven-idea-plugin:1.5) = 1.4") self.assertEqual(set(want), set(sout)) - - @mavenreq(["require_mixed/require.xml"]) + @mavenreq(["require_mixed/buildroot/usr/share/maven-metadata/require.xml"]) def test_mixed(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -106,7 +99,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven.plugins:maven-idea-plugin)") self.assertEqual(set(want), set(sout)) - @mavenreq(["requires_simple_subpackages/require.xml"]) + @mavenreq(["requires_simple_subpackages/buildroot/usr/share/maven-metadata/require.xml"]) def test_simple_subpackage(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -114,7 +107,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven:maven-plugin-api) = 3.2.1") self.assertEqual(set(want), set(sout)) - @mavenreq(["requires_simple_subpackages2/require.xml"]) + @mavenreq(["requires_simple_subpackages2/buildroot/usr/share/maven-metadata/require.xml"]) def test_simple_subpackage2(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -123,7 +116,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.codehaus.plexus:plexus-utils)") self.assertEqual(set(want), set(sout)) - @mavenreq(["requires_simple_subpackages2_compat/require.xml"]) + @mavenreq(["requires_simple_subpackages2_compat/buildroot/usr/share/maven-metadata/require.xml"]) def test_simple_subpackage3(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -131,7 +124,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven:maven-plugin-api:3.2.0) = 3.2.1") self.assertEqual(set(want), set(sout)) - @mavenreq(["requires_simple_subpackages2_compat2/require.xml"]) + @mavenreq(["requires_simple_subpackages2_compat2/buildroot/usr/share/maven-metadata/require.xml"]) def test_simple_subpackage4(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -139,7 +132,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven:maven-plugin-api)") self.assertEqual(set(want), set(sout)) - @mavenreq(["requires_on_artifact_from_same_package/require.xml"]) + @mavenreq(["requires_on_artifact_from_same_package/buildroot/usr/share/maven-metadata/require.xml"]) def test_simple_artifact_in_same_package(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -147,7 +140,7 @@ class TestMavenReq(unittest.TestCase): self.assertEqual(set(want), set(sout)) #test for rhbz#1012980 - @mavenreq(["require_skipped/require.xml"]) + @mavenreq(["require_skipped/buildroot/usr/share/maven-metadata/require.xml"]) def test_require_skipped(self, stdout, stderr, return_value): self.assertNotEqual(return_value, 0) self.assertNotEqual(stderr, '') @@ -157,7 +150,7 @@ class TestMavenReq(unittest.TestCase): 'required by org.apache.commons-lang:commons-lang') # rhbz#1017701 comment 2 - @mavenreq(["aether/require.xml"]) + @mavenreq(["aether/buildroot/usr/share/maven-metadata/require.xml"]) def test_rhbz1017701_c2(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -166,7 +159,7 @@ class TestMavenReq(unittest.TestCase): self.assertEqual(set(want), set(sout)) - @mavenreq(["require1/require.xml"], config='alternative-java') + @mavenreq(["require1/buildroot/usr/share/maven-metadata/require.xml"], config='alternative-java') def test_java_config(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -174,7 +167,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.apache.maven:maven-project)") self.assertEqual(set(want), set(sout)) - @mavenreq(["require_multi/require.xml"], config='filtered') + @mavenreq(["require_multi/buildroot/usr/share/maven-metadata/require.xml"], config='filtered') def test_dep_filtering(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -183,7 +176,7 @@ class TestMavenReq(unittest.TestCase): "jpackage-utils") self.assertEqual(set(want), set(sout)) - @mavenreq(["require_multi/require.xml"], javaconfdirs=['data/config/filtered']) + @mavenreq(["require_multi/buildroot/usr/share/maven-metadata/require.xml"], javaconfdirs=['data/config/filtered']) def test_config_env1(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -192,7 +185,7 @@ class TestMavenReq(unittest.TestCase): "jpackage-utils") self.assertEqual(set(want), set(sout)) - @mavenreq(["require_multi/require.xml"], + @mavenreq(["require_multi/buildroot/usr/share/maven-metadata/require.xml"], javaconfdirs=['data/config/filtered', 'data/config/alternative-java']) def test_config_env2(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) @@ -202,7 +195,7 @@ class TestMavenReq(unittest.TestCase): "jpackage-utils") self.assertEqual(set(want), set(sout)) - @mavenreq(["require2/maven-metadata/require.xml"]) + @mavenreq(["require2/buildroot/usr/share/maven-metadata/require.xml"]) def test_deps_from_pom(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -211,7 +204,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.fedoraproject.xmvn:xmvn-api)") self.assertEqual(set(want), set(sout)) - @mavenreq(["require3/maven-metadata/require.xml"]) + @mavenreq(["require3/buildroot/usr/share/maven-metadata/require.xml"]) def test_deps_from_pom_with_parent(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -219,7 +212,7 @@ class TestMavenReq(unittest.TestCase): "mvn(org.fedoraproject.xmvn:xmvn-api:pom:)", "java-headless") self.assertEqual(set(want), set(sout)) - @mavenreq(["require4/maven-metadata/require.xml"]) + @mavenreq(["require4/buildroot/usr/share/maven-metadata/require.xml"]) def test_deps_from_pom_on_subpkg(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] @@ -227,34 +220,34 @@ class TestMavenReq(unittest.TestCase): "mvn(org.fedoraproject.xmvn:xmvn-api:pom:) = 1.0", "java-headless") self.assertEqual(set(want), set(sout)) - @mavenreq(["require5/require.xml"]) + @mavenreq(["require5/buildroot/usr/share/maven-metadata/require.xml"]) def test_unknown_dep(self, stdout, stderr, return_value): self.assertNotEqual(return_value, 0) serr = [x for x in stderr.split('\n') if x] want = ("org.apache.maven:maven-project:2.2.1") assertIn(self, want, serr) - @mavenreq(["require6/require.xml"]) + @mavenreq(["require6/buildroot/usr/share/maven-metadata/require.xml"]) def test_pom_dep_fail(self, stdout, stderr, return_value): self.assertNotEqual(return_value, 0) want = ("unresolvable:pom-dependency:pom:2.2.1") self.assertTrue(want in stderr, stderr) - @mavenreq(["osgi_simple/require.xml"]) + @mavenreq(["osgi_simple/buildroot/usr/share/maven-metadata/require.xml"]) def test_osgi_basic(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("osgi(osgi.req1)", "jpackage-utils", "java-headless") self.assertEqual(set(want), set(sout)) - @mavenreq(["osgi_self/require.xml"]) + @mavenreq(["osgi_self/buildroot/usr/share/maven-metadata/require.xml"]) def test_osgi_self(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] want = ("jpackage-utils", "java-headless") self.assertEqual(set(want), set(sout)) - @mavenreq(["osgi_versioned/maven-metadata/require.xml"]) + @mavenreq(["osgi_versioned/buildroot/usr/share/maven-metadata/require.xml"]) def test_osgi_versioned(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] diff --git a/test/test_common.py b/test/test_common.py index 9339b99..98039aa 100644 --- a/test/test_common.py +++ b/test/test_common.py @@ -119,26 +119,9 @@ def xmvnconfig(name, fnargs): return test_decorated return test_decorator -def build_depmap_paths(filelist): - paths = [] - for filename in filelist: - paths.append(os.path.join(DIRPATH, 'metadata', filename)) - return '\n'.join(paths) -def mavenprov(filelist): - def test_decorator(fun): - def test_decorated(self): - env = {"RPM_BUILD_ROOT": "/dev/null"} - scriptpath = path.join(DIRPATH, '..', 'depgenerators', 'maven.prov') - stdin = build_depmap_paths(filelist) - (stdout, stderr, return_value) = call_script(scriptpath, - ["--cachedir", "/tmp"], stdin=stdin, wrapped=True, extra_env=env) - fun(self, stdout, stderr, return_value) - return test_decorated - return test_decorator - - -def call_rpmgen(rpmgen_name, filelist_prefix, filelist, env=None): +def call_rpmgen(rpmgen_name, filelist_prefix, filelist, env=None, + config=''): scriptpath = path.join(DIRPATH, '..', 'depgenerators', rpmgen_name) stdin = [] stdin.extend([os.path.abspath(os.path.join(filelist_prefix, x)) @@ -163,7 +146,7 @@ def call_rpmgen(rpmgen_name, filelist_prefix, filelist, env=None): pass for line in stdin: ret = call_script(scriptpath, ["--cachedir", "/tmp"], stdin=line, - wrapped=True, extra_env=env) + wrapped=True, extra_env=env, config_path=config) try: shutil.rmtree("/tmp/.javapackages_cache/") except OSError: @@ -193,31 +176,44 @@ def osgireq(*args, **kwargs): return test_decorator -def requires_generator(name, filelist, config=None, javaconfdirs=None): +def mavenprov(*args, **kwargs): def test_decorator(fun): def test_decorated(self): - scriptpath = path.join(DIRPATH, '..', 'depgenerators', name) - stdin = build_depmap_paths(filelist) - env = {'RPM_BUILD_ROOT': os.getcwd()} - if javaconfdirs: - confdirs = [os.path.join(DIRPATH, conf) for conf in javaconfdirs] - env['JAVACONFDIRS'] = os.pathsep.join(confdirs) - if config: - config_path = os.path.join(DIRPATH, 'data', 'config', config) - else: - config_path = os.path.join(DIRPATH, '..', 'etc') - (stdout, stderr, return_value) = call_script(scriptpath, - ["--cachedir", "/tmp"], stdin=stdin, wrapped=True, extra_env=env, - config_path=config_path) + (stdout, stderr, return_value) = call_rpmgen("maven.prov", + "metadata/", + *args, **kwargs) fun(self, stdout, stderr, return_value) return test_decorated return test_decorator + def mavenreq(*args, **kwargs): - return requires_generator('maven.req', *args, **kwargs) + def test_decorator(fun): + def test_decorated(self): + if "config" in kwargs: + config_path = os.path.join(DIRPATH, 'data', 'config', kwargs["config"]) + else: + config_path = os.path.abspath(os.path.join(DIRPATH, '..', 'etc')) + kwargs.update({"config": config_path}) + if "javaconfdirs" in kwargs: + confdirs = [os.path.join(DIRPATH, conf) for conf in kwargs["javaconfdirs"]] + try: + env = kwargs["env"] + except KeyError: + env = {} + env.update({"JAVACONFDIRS": os.pathsep.join(confdirs)}) + kwargs.update({"env": env}) + del kwargs["javaconfdirs"] + (stdout, stderr, return_value) = call_rpmgen("maven.req", + "metadata/", + *args, + **kwargs) + fun(self, stdout, stderr, return_value) + return test_decorated + return test_decorator -def javadocreq(*args, **kwargs): - return requires_generator('javadoc.req', *args, **kwargs) +#def javadocreq(*args, **kwargs): +# return requires_generator('javadoc.req', *args, **kwargs) def mvn_depmap(pom, jar=None, fnargs=None): def test_decorator(fun):

9 years, 6 months

1
0
0 / 0

[javapackages] [test] Modify test data to reflect changes in RPM dep. generators

by Michal Srb

commit 2fa5f469c35ec305f1d93cb164684ca9f25224e1 Author: Michal Srb <msrb(a)redhat.com> Date: Thu Dec 4 13:58:21 2014 +0100 [test] Modify test data to reflect changes in RPM dep. generators .../usr/share/maven-metadata}/fragment.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../buildroot/usr/share/maven-metadata}/alias.xml | 0 .../buildroot/usr/share/maven-metadata}/alias2.xml | 0 .../usr/share/maven-metadata}/compat_alias.xml | 0 .../usr/share/maven-metadata}/extension1.xml | 0 .../usr/share/maven-metadata}/extension2.xml | 0 .../usr/share/maven-metadata}/invalid.xml | 0 .../usr/share/maven-metadata}/jar_extension.xml | 0 .../usr/share/maven-metadata}/multi_ns.xml | 0 .../usr/share/maven-metadata}/non_compat.xml | 0 .../usr/share/maven-metadata}/not_xml.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share}/maven-metadata/require.xml | 0 .../usr/share}/maven-metadata/require1.xml | 0 .../usr/share/maven-metadata}/pom_compat.xml | 0 .../usr/share/maven-metadata}/pom_extension.xml | 0 .../usr/share/maven-metadata}/pom_namespace.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share}/maven-metadata/require.xml | 2 +- .../{ => buildroot/usr/share}/maven-poms/pom.xml | 0 .../usr/share}/maven-metadata/require.xml | 2 +- .../{ => buildroot/usr/share}/maven-poms/pom.xml | 0 .../usr/share}/maven-metadata/require.xml | 2 +- .../usr/share}/maven-metadata/require_dep.xml | 0 .../{ => buildroot/usr/share}/maven-poms/pom.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/fragment.xml | 0 .../usr/share/maven-metadata}/fragment2.xml | 0 .../usr/share/maven-metadata}/fragment3.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata/require1.xml} | 0 .../usr/share/maven-metadata/require2.xml} | 0 .../usr/share/maven-metadata/require3.xml} | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/fragment.xml | 0 .../usr/share/maven-metadata}/fragment2.xml | 0 .../usr/share/maven-metadata}/fragment3.xml | 0 .../usr/share/maven-metadata}/fragment4.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/require.xml | 2 +- .../usr/share/maven-metadata/require1.xml} | 0 .../usr/share/maven-metadata}/fragment.xml | 0 .../usr/share/maven-metadata}/fragment3.xml | 0 .../usr/share/maven-metadata}/require.xml | 2 +- .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/fragment.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/fragment.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/fragment.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../usr/share/maven-metadata}/fragment.xml | 0 .../usr/share/maven-metadata}/require.xml | 0 .../buildroot/usr/share/maven-metadata}/simple.xml | 0 .../usr/share/maven-metadata}/single_ns.xml | 0 62 files changed, 5 insertions(+), 5 deletions(-) --- diff --git a/test/metadata/aether/fragment.xml b/test/metadata/aether/buildroot/usr/share/maven-metadata/fragment.xml similarity index 100% rename from test/metadata/aether/fragment.xml rename to test/metadata/aether/buildroot/usr/share/maven-metadata/fragment.xml diff --git a/test/metadata/aether/require.xml b/test/metadata/aether/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/aether/require.xml rename to test/metadata/aether/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/alias.xml b/test/metadata/alias/buildroot/usr/share/maven-metadata/alias.xml similarity index 100% rename from test/metadata/alias.xml rename to test/metadata/alias/buildroot/usr/share/maven-metadata/alias.xml diff --git a/test/metadata/alias2.xml b/test/metadata/alias2/buildroot/usr/share/maven-metadata/alias2.xml similarity index 100% rename from test/metadata/alias2.xml rename to test/metadata/alias2/buildroot/usr/share/maven-metadata/alias2.xml diff --git a/test/metadata/compat_alias.xml b/test/metadata/compat_alias/buildroot/usr/share/maven-metadata/compat_alias.xml similarity index 100% rename from test/metadata/compat_alias.xml rename to test/metadata/compat_alias/buildroot/usr/share/maven-metadata/compat_alias.xml diff --git a/test/metadata/extension1.xml b/test/metadata/extension1/buildroot/usr/share/maven-metadata/extension1.xml similarity index 100% rename from test/metadata/extension1.xml rename to test/metadata/extension1/buildroot/usr/share/maven-metadata/extension1.xml diff --git a/test/metadata/extension2.xml b/test/metadata/extension2/buildroot/usr/share/maven-metadata/extension2.xml similarity index 100% rename from test/metadata/extension2.xml rename to test/metadata/extension2/buildroot/usr/share/maven-metadata/extension2.xml diff --git a/test/metadata/invalid.xml b/test/metadata/invalid/buildroot/usr/share/maven-metadata/invalid.xml similarity index 100% rename from test/metadata/invalid.xml rename to test/metadata/invalid/buildroot/usr/share/maven-metadata/invalid.xml diff --git a/test/metadata/jar_extension.xml b/test/metadata/jar_extension/buildroot/usr/share/maven-metadata/jar_extension.xml similarity index 100% rename from test/metadata/jar_extension.xml rename to test/metadata/jar_extension/buildroot/usr/share/maven-metadata/jar_extension.xml diff --git a/test/metadata/multi_ns.xml b/test/metadata/multi_ns/buildroot/usr/share/maven-metadata/multi_ns.xml similarity index 100% rename from test/metadata/multi_ns.xml rename to test/metadata/multi_ns/buildroot/usr/share/maven-metadata/multi_ns.xml diff --git a/test/metadata/non_compat.xml b/test/metadata/non_compat/buildroot/usr/share/maven-metadata/non_compat.xml similarity index 100% rename from test/metadata/non_compat.xml rename to test/metadata/non_compat/buildroot/usr/share/maven-metadata/non_compat.xml diff --git a/test/metadata/not_xml.xml b/test/metadata/notxml/buildroot/usr/share/maven-metadata/not_xml.xml similarity index 100% rename from test/metadata/not_xml.xml rename to test/metadata/notxml/buildroot/usr/share/maven-metadata/not_xml.xml diff --git a/test/metadata/osgi_self/require.xml b/test/metadata/osgi_self/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/osgi_self/require.xml rename to test/metadata/osgi_self/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/osgi_simple/require.xml b/test/metadata/osgi_simple/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/osgi_simple/require.xml rename to test/metadata/osgi_simple/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/osgi_versioned/maven-metadata/require.xml b/test/metadata/osgi_versioned/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/osgi_versioned/maven-metadata/require.xml rename to test/metadata/osgi_versioned/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/osgi_versioned/maven-metadata/require1.xml b/test/metadata/osgi_versioned/buildroot/usr/share/maven-metadata/require1.xml similarity index 100% rename from test/metadata/osgi_versioned/maven-metadata/require1.xml rename to test/metadata/osgi_versioned/buildroot/usr/share/maven-metadata/require1.xml diff --git a/test/metadata/pom_compat.xml b/test/metadata/pom_compat/buildroot/usr/share/maven-metadata/pom_compat.xml similarity index 100% rename from test/metadata/pom_compat.xml rename to test/metadata/pom_compat/buildroot/usr/share/maven-metadata/pom_compat.xml diff --git a/test/metadata/pom_extension.xml b/test/metadata/pom_extension/buildroot/usr/share/maven-metadata/pom_extension.xml similarity index 100% rename from test/metadata/pom_extension.xml rename to test/metadata/pom_extension/buildroot/usr/share/maven-metadata/pom_extension.xml diff --git a/test/metadata/pom_namespace.xml b/test/metadata/pom_namespace/buildroot/usr/share/maven-metadata/pom_namespace.xml similarity index 100% rename from test/metadata/pom_namespace.xml rename to test/metadata/pom_namespace/buildroot/usr/share/maven-metadata/pom_namespace.xml diff --git a/test/metadata/require-java-both/require.xml b/test/metadata/require-java-both/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require-java-both/require.xml rename to test/metadata/require-java-both/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require-java-devel/require.xml b/test/metadata/require-java-devel/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require-java-devel/require.xml rename to test/metadata/require-java-devel/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require-java/require.xml b/test/metadata/require-java/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require-java/require.xml rename to test/metadata/require-java/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require1/require.xml b/test/metadata/require1/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require1/require.xml rename to test/metadata/require1/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require2/maven-metadata/require.xml b/test/metadata/require2/buildroot/usr/share/maven-metadata/require.xml similarity index 87% rename from test/metadata/require2/maven-metadata/require.xml rename to test/metadata/require2/buildroot/usr/share/maven-metadata/require.xml index 333e830..17df7d5 100644 --- a/test/metadata/require2/maven-metadata/require.xml +++ b/test/metadata/require2/buildroot/usr/share/maven-metadata/require.xml @@ -9,7 +9,7 @@ <compatVersions> <version>1.0</version> </compatVersions> - <path>/metadata/require2/maven-poms/pom.xml</path> + <path>/usr/share/maven-poms/pom.xml</path> </artifact> </artifacts> </metadata> diff --git a/test/metadata/require2/maven-poms/pom.xml b/test/metadata/require2/buildroot/usr/share/maven-poms/pom.xml similarity index 100% rename from test/metadata/require2/maven-poms/pom.xml rename to test/metadata/require2/buildroot/usr/share/maven-poms/pom.xml diff --git a/test/metadata/require4/maven-metadata/require.xml b/test/metadata/require3/buildroot/usr/share/maven-metadata/require.xml similarity index 87% rename from test/metadata/require4/maven-metadata/require.xml rename to test/metadata/require3/buildroot/usr/share/maven-metadata/require.xml index 29f9c27..ce83f58 100644 --- a/test/metadata/require4/maven-metadata/require.xml +++ b/test/metadata/require3/buildroot/usr/share/maven-metadata/require.xml @@ -9,7 +9,7 @@ <compatVersions> <version>1.0</version> </compatVersions> - <path>/metadata/require4/maven-poms/pom.xml</path> + <path>/usr/share/maven-poms/pom.xml</path> </artifact> </artifacts> </metadata> diff --git a/test/metadata/require3/maven-poms/pom.xml b/test/metadata/require3/buildroot/usr/share/maven-poms/pom.xml similarity index 100% rename from test/metadata/require3/maven-poms/pom.xml rename to test/metadata/require3/buildroot/usr/share/maven-poms/pom.xml diff --git a/test/metadata/require3/maven-metadata/require.xml b/test/metadata/require4/buildroot/usr/share/maven-metadata/require.xml similarity index 87% rename from test/metadata/require3/maven-metadata/require.xml rename to test/metadata/require4/buildroot/usr/share/maven-metadata/require.xml index 53ca615..ce83f58 100644 --- a/test/metadata/require3/maven-metadata/require.xml +++ b/test/metadata/require4/buildroot/usr/share/maven-metadata/require.xml @@ -9,7 +9,7 @@ <compatVersions> <version>1.0</version> </compatVersions> - <path>/metadata/require3/maven-poms/pom.xml</path> + <path>/usr/share/maven-poms/pom.xml</path> </artifact> </artifacts> </metadata> diff --git a/test/metadata/require4/maven-metadata/require_dep.xml b/test/metadata/require4/buildroot/usr/share/maven-metadata/require_dep.xml similarity index 100% rename from test/metadata/require4/maven-metadata/require_dep.xml rename to test/metadata/require4/buildroot/usr/share/maven-metadata/require_dep.xml diff --git a/test/metadata/require4/maven-poms/pom.xml b/test/metadata/require4/buildroot/usr/share/maven-poms/pom.xml similarity index 100% rename from test/metadata/require4/maven-poms/pom.xml rename to test/metadata/require4/buildroot/usr/share/maven-poms/pom.xml diff --git a/test/metadata/require5/require.xml b/test/metadata/require5/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require5/require.xml rename to test/metadata/require5/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require6/require.xml b/test/metadata/require6/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require6/require.xml rename to test/metadata/require6/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require_mixed/fragment.xml b/test/metadata/require_mixed/buildroot/usr/share/maven-metadata/fragment.xml similarity index 100% rename from test/metadata/require_mixed/fragment.xml rename to test/metadata/require_mixed/buildroot/usr/share/maven-metadata/fragment.xml diff --git a/test/metadata/require_mixed/fragment2.xml b/test/metadata/require_mixed/buildroot/usr/share/maven-metadata/fragment2.xml similarity index 100% rename from test/metadata/require_mixed/fragment2.xml rename to test/metadata/require_mixed/buildroot/usr/share/maven-metadata/fragment2.xml diff --git a/test/metadata/require_mixed/fragment3.xml b/test/metadata/require_mixed/buildroot/usr/share/maven-metadata/fragment3.xml similarity index 100% rename from test/metadata/require_mixed/fragment3.xml rename to test/metadata/require_mixed/buildroot/usr/share/maven-metadata/fragment3.xml diff --git a/test/metadata/require_mixed/require.xml b/test/metadata/require_mixed/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require_mixed/require.xml rename to test/metadata/require_mixed/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require_multi/require.xml b/test/metadata/require_multi/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require_multi/require.xml rename to test/metadata/require_multi/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require_multi/fragment.xml b/test/metadata/require_multi/buildroot/usr/share/maven-metadata/require1.xml similarity index 100% rename from test/metadata/require_multi/fragment.xml rename to test/metadata/require_multi/buildroot/usr/share/maven-metadata/require1.xml diff --git a/test/metadata/require_multi/fragment2.xml b/test/metadata/require_multi/buildroot/usr/share/maven-metadata/require2.xml similarity index 100% rename from test/metadata/require_multi/fragment2.xml rename to test/metadata/require_multi/buildroot/usr/share/maven-metadata/require2.xml diff --git a/test/metadata/require_multi/fragment3.xml b/test/metadata/require_multi/buildroot/usr/share/maven-metadata/require3.xml similarity index 100% rename from test/metadata/require_multi/fragment3.xml rename to test/metadata/require_multi/buildroot/usr/share/maven-metadata/require3.xml diff --git a/test/metadata/require_multi_namespaces/require.xml b/test/metadata/require_multi_namespaces/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require_multi_namespaces/require.xml rename to test/metadata/require_multi_namespaces/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require_multi_versioned/fragment.xml b/test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/fragment.xml similarity index 100% rename from test/metadata/require_multi_versioned/fragment.xml rename to test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/fragment.xml diff --git a/test/metadata/require_multi_versioned/fragment2.xml b/test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/fragment2.xml similarity index 100% rename from test/metadata/require_multi_versioned/fragment2.xml rename to test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/fragment2.xml diff --git a/test/metadata/require_multi_versioned/fragment3.xml b/test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/fragment3.xml similarity index 100% rename from test/metadata/require_multi_versioned/fragment3.xml rename to test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/fragment3.xml diff --git a/test/metadata/require_multi_versioned/fragment4.xml b/test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/fragment4.xml similarity index 100% rename from test/metadata/require_multi_versioned/fragment4.xml rename to test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/fragment4.xml diff --git a/test/metadata/require_multi_versioned/require.xml b/test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/require_multi_versioned/require.xml rename to test/metadata/require_multi_versioned/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/require_parent/require.xml b/test/metadata/require_parent/buildroot/usr/share/maven-metadata/require.xml similarity index 96% rename from test/metadata/require_parent/require.xml rename to test/metadata/require_parent/buildroot/usr/share/maven-metadata/require.xml index eb39678..03757c6 100644 --- a/test/metadata/require_parent/require.xml +++ b/test/metadata/require_parent/buildroot/usr/share/maven-metadata/require.xml @@ -28,7 +28,7 @@ <compatVersions> <version>6.0.18</version> </compatVersions> - <path>/usr/share/java/jetty/jsp-2.1-glassfish.jar</path> + <path>/usr/share/maven-poms/jsp-2.1-glassfish.pom</path> <dependencies> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/test/metadata/require_parent/fragment.xml b/test/metadata/require_parent/buildroot/usr/share/maven-metadata/require1.xml similarity index 100% rename from test/metadata/require_parent/fragment.xml rename to test/metadata/require_parent/buildroot/usr/share/maven-metadata/require1.xml diff --git a/test/metadata/require_skipped/fragment.xml b/test/metadata/require_skipped/buildroot/usr/share/maven-metadata/fragment.xml similarity index 100% rename from test/metadata/require_skipped/fragment.xml rename to test/metadata/require_skipped/buildroot/usr/share/maven-metadata/fragment.xml diff --git a/test/metadata/require_skipped/fragment3.xml b/test/metadata/require_skipped/buildroot/usr/share/maven-metadata/fragment3.xml similarity index 100% rename from test/metadata/require_skipped/fragment3.xml rename to test/metadata/require_skipped/buildroot/usr/share/maven-metadata/fragment3.xml diff --git a/test/metadata/require_skipped/require.xml b/test/metadata/require_skipped/buildroot/usr/share/maven-metadata/require.xml similarity index 97% rename from test/metadata/require_skipped/require.xml rename to test/metadata/require_skipped/buildroot/usr/share/maven-metadata/require.xml index d36f9ce..806df36 100644 --- a/test/metadata/require_skipped/require.xml +++ b/test/metadata/require_skipped/buildroot/usr/share/maven-metadata/require.xml @@ -33,7 +33,7 @@ <version>9.1.1.B60.25.p2</version> <extension>pom</extension> <namespace>ns</namespace> - <path>/usr/share/java/jetty/jsp-2.1-glassfish.jar</path> + <path>/usr/share/maven-poms/jsp-2.1-glassfish.pom</path> <dependencies> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/test/metadata/requires_on_artifact_from_same_package/require.xml b/test/metadata/requires_on_artifact_from_same_package/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/requires_on_artifact_from_same_package/require.xml rename to test/metadata/requires_on_artifact_from_same_package/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/requires_simple_subpackages/fragment.xml b/test/metadata/requires_simple_subpackages/buildroot/usr/share/maven-metadata/fragment.xml similarity index 100% rename from test/metadata/requires_simple_subpackages/fragment.xml rename to test/metadata/requires_simple_subpackages/buildroot/usr/share/maven-metadata/fragment.xml diff --git a/test/metadata/requires_simple_subpackages/require.xml b/test/metadata/requires_simple_subpackages/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/requires_simple_subpackages/require.xml rename to test/metadata/requires_simple_subpackages/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/requires_simple_subpackages2/fragment.xml b/test/metadata/requires_simple_subpackages2/buildroot/usr/share/maven-metadata/fragment.xml similarity index 100% rename from test/metadata/requires_simple_subpackages2/fragment.xml rename to test/metadata/requires_simple_subpackages2/buildroot/usr/share/maven-metadata/fragment.xml diff --git a/test/metadata/requires_simple_subpackages2/require.xml b/test/metadata/requires_simple_subpackages2/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/requires_simple_subpackages2/require.xml rename to test/metadata/requires_simple_subpackages2/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/requires_simple_subpackages2_compat/fragment.xml b/test/metadata/requires_simple_subpackages2_compat/buildroot/usr/share/maven-metadata/fragment.xml similarity index 100% rename from test/metadata/requires_simple_subpackages2_compat/fragment.xml rename to test/metadata/requires_simple_subpackages2_compat/buildroot/usr/share/maven-metadata/fragment.xml diff --git a/test/metadata/requires_simple_subpackages2_compat/require.xml b/test/metadata/requires_simple_subpackages2_compat/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/requires_simple_subpackages2_compat/require.xml rename to test/metadata/requires_simple_subpackages2_compat/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/requires_simple_subpackages2_compat2/fragment.xml b/test/metadata/requires_simple_subpackages2_compat2/buildroot/usr/share/maven-metadata/fragment.xml similarity index 100% rename from test/metadata/requires_simple_subpackages2_compat2/fragment.xml rename to test/metadata/requires_simple_subpackages2_compat2/buildroot/usr/share/maven-metadata/fragment.xml diff --git a/test/metadata/requires_simple_subpackages2_compat2/require.xml b/test/metadata/requires_simple_subpackages2_compat2/buildroot/usr/share/maven-metadata/require.xml similarity index 100% rename from test/metadata/requires_simple_subpackages2_compat2/require.xml rename to test/metadata/requires_simple_subpackages2_compat2/buildroot/usr/share/maven-metadata/require.xml diff --git a/test/metadata/simple.xml b/test/metadata/simple/buildroot/usr/share/maven-metadata/simple.xml similarity index 100% rename from test/metadata/simple.xml rename to test/metadata/simple/buildroot/usr/share/maven-metadata/simple.xml diff --git a/test/metadata/single_ns.xml b/test/metadata/single_ns/buildroot/usr/share/maven-metadata/single_ns.xml similarity index 100% rename from test/metadata/single_ns.xml rename to test/metadata/single_ns/buildroot/usr/share/maven-metadata/single_ns.xml

9 years, 6 months

1
0
0 / 0

[javapackages] [test] Fix OSGi tests

by Michal Srb

commit a1c7e5e2f65fbfc637188c32621379c0ead16cdd Author: Michal Srb <msrb(a)redhat.com> Date: Thu Dec 4 09:04:14 2014 +0100 [test] Fix OSGi tests test/osgi_prov_test.py | 9 +++------ test/osgi_req_test.py | 14 +++----------- 2 files changed, 6 insertions(+), 17 deletions(-) --- diff --git a/test/osgi_prov_test.py b/test/osgi_prov_test.py index f36ce76..620cfea 100644 --- a/test/osgi_prov_test.py +++ b/test/osgi_prov_test.py @@ -11,22 +11,19 @@ class TestOSGiProv(unittest.TestCase): sout = [x for x in stdout.split('\n') if x] self.assertEqual(len(sout), 0) - @osgiprov(["data/osgi/basic/buildroot/usr/share/META-INF/MANIFEST.MF", - "data/osgi/basic/buildroot/"]) + @osgiprov(["basic/buildroot/usr/share/META-INF/MANIFEST.MF"]) def test_basic(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] assertIn(self, "osgi(org.junit) = 4.10.0", sout) - @osgiprov(["data/osgi/basic_jar/buildroot/usr/lib/basic.jar", - "data/osgi/basic_jar/buildroot/"]) + @osgiprov(["basic_jar/buildroot/usr/lib/basic.jar"]) def test_basic_jar(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] assertIn(self, "osgi(org.junit) = 4.10.0", sout) - @osgiprov(["data/osgi/empty/buildroot/usr/share/META-INF/MANIFEST.MF", - "data/osgi/empty/buildroot/"]) + @osgiprov(["empty/buildroot/usr/share/META-INF/MANIFEST.MF"]) def test_empty(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] diff --git a/test/osgi_req_test.py b/test/osgi_req_test.py index 6662395..e62341a 100644 --- a/test/osgi_req_test.py +++ b/test/osgi_req_test.py @@ -5,27 +5,19 @@ from test_common import * class TestOSGiReq(unittest.TestCase): - def tearDown(self): - try: - shutil.rmtree("/tmp/.javapackages_cache/") - except OSError: - pass - - @osgireq(["data/osgi/basic/buildroot/usr/share/META-INF/MANIFEST.MF", - "data/osgi/basic/buildroot/"]) + @osgireq(["basic/buildroot/usr/share/META-INF/MANIFEST.MF"]) def test_basic(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] assertIn(self, "osgi(org.hamcrest.core)", sout) - @osgireq(["data/osgi/basic_jar/buildroot/usr/lib/basic.jar", - "data/osgi/basic_jar/buildroot/"]) + @osgireq(["basic_jar/buildroot/usr/lib/basic.jar"]) def test_basic_jar(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x] assertIn(self, "osgi(org.hamcrest.core)", sout) - @osgireq(["data/osgi/empty/META-INF/MANIFEST.MF"]) + @osgireq(["empty/META-INF/MANIFEST.MF"]) def test_empty(self, stdout, stderr, return_value): self.assertEqual(return_value, 0, stderr) sout = [x for x in stdout.split('\n') if x]

9 years, 6 months

1
0
0 / 0

[javapackages] [test] Simplify code for calling RPM generators

by Michal Srb

commit 9e0e59709140802a38bacf3a62207152798d22e0 Author: Michal Srb <msrb(a)redhat.com> Date: Thu Dec 4 09:03:09 2014 +0100 [test] Simplify code for calling RPM generators test/test_common.py | 48 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 14 deletions(-) --- diff --git a/test/test_common.py b/test/test_common.py index 75f6fde..9339b99 100644 --- a/test/test_common.py +++ b/test/test_common.py @@ -138,14 +138,32 @@ def mavenprov(filelist): return test_decorator -def osgi_common(args, scriptpath): - stdin = os.path.abspath(args[0]) - if len(args) == 2: - extra_env = {"RPM_BUILD_ROOT": args[1]} - else: - extra_env = {"RPM_BUILD_ROOT": "/dev/null"} - ret = call_script(scriptpath, ["--cachedir", "/tmp"], stdin=stdin, - wrapped=True, extra_env=extra_env) +def call_rpmgen(rpmgen_name, filelist_prefix, filelist, env=None): + scriptpath = path.join(DIRPATH, '..', 'depgenerators', rpmgen_name) + stdin = [] + stdin.extend([os.path.abspath(os.path.join(filelist_prefix, x)) + for x in filelist]) + + buildroot = "/dev/null" + + if not env: + env = {} + + if "RPM_BUILD_ROOT" not in env: + result = re.match(".*?/buildroot/", stdin[0]) + if result: + buildroot = os.path.abspath(result.group(0)) + env.update({"RPM_BUILD_ROOT": buildroot}) + else: + env.update({"RPM_BUILD_ROOT": "/dev/null"}) + + try: + shutil.rmtree("/tmp/.javapackages_cache/") + except OSError: + pass + for line in stdin: + ret = call_script(scriptpath, ["--cachedir", "/tmp"], stdin=line, + wrapped=True, extra_env=env) try: shutil.rmtree("/tmp/.javapackages_cache/") except OSError: @@ -153,21 +171,23 @@ def osgi_common(args, scriptpath): return ret -def osgiprov(args): +def osgiprov(*args, **kwargs): def test_decorator(fun): def test_decorated(self): - scriptpath = path.join(DIRPATH, '..', 'depgenerators', 'osgi.prov') - (stdout, stderr, return_value) = osgi_common(args, scriptpath) + (stdout, stderr, return_value) = call_rpmgen("osgi.prov", + "data/osgi/", + *args, **kwargs) fun(self, stdout, stderr, return_value) return test_decorated return test_decorator -def osgireq(args): +def osgireq(*args, **kwargs): def test_decorator(fun): def test_decorated(self): - scriptpath = path.join(DIRPATH, '..', 'depgenerators', 'osgi.req') - (stdout, stderr, return_value) = osgi_common(args, scriptpath) + (stdout, stderr, return_value) = call_rpmgen("osgi.req", + "data/osgi/", + *args, **kwargs) fun(self, stdout, stderr, return_value) return test_decorated return test_decorator

9 years, 6 months

1
0
0 / 0

[javapackages] [test] Do not throw OSError exception when cachedir doesn't exist

by Michal Srb

commit ff35bf229ed85b079dc5320d73666e9e305ba389 Author: Michal Srb <msrb(a)redhat.com> Date: Wed Dec 3 14:21:29 2014 +0100 [test] Do not throw OSError exception when cachedir doesn't exist test/test_common.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) --- diff --git a/test/test_common.py b/test/test_common.py index 8a5b22c..75f6fde 100644 --- a/test/test_common.py +++ b/test/test_common.py @@ -146,7 +146,10 @@ def osgi_common(args, scriptpath): extra_env = {"RPM_BUILD_ROOT": "/dev/null"} ret = call_script(scriptpath, ["--cachedir", "/tmp"], stdin=stdin, wrapped=True, extra_env=extra_env) - shutil.rmtree("/tmp/.javapackages_cache/") + try: + shutil.rmtree("/tmp/.javapackages_cache/") + except OSError: + pass return ret

9 years, 6 months

1
0
0 / 0

[javapackages] [osgi] Remove unneeded imports

by Michal Srb

commit 576e3913d6ed0a8cccf3cd5881e28912c7bb18e7 Author: Michal Srb <msrb(a)redhat.com> Date: Wed Dec 3 10:10:26 2014 +0100 [osgi] Remove unneeded imports python/javapackages/common/osgi.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) --- diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py index 7a33361..541bc03 100644 --- a/python/javapackages/common/osgi.py +++ b/python/javapackages/common/osgi.py @@ -35,11 +35,9 @@ import os import pickle import re -import subprocess import javapackages.common.config as config from javapackages.common.manifest import Manifest -from javapackages.common.util import execute_command class OSGiRequire(object):

9 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits December 2014