#232 Ignore FMF fails.
Merged 5 years ago by astepano. Opened 5 years ago by astepano.

@@ -148,6 +148,10 @@ 

      very resource consuming when walking through big project with many

      directories.

  

+     Returns

+     -------

+     fmf.Tree() object or False.

+ 

      """

      tree = None

      """fmf.Tree() object."""
@@ -156,7 +160,12 @@ 

      def get(self, path="."):

          if self.path != path or self.tree is None:

              FmfMetadataTree.path = path

-             FmfMetadataTree.tree = fmf.Tree(path)

+             try:

+                 FmfMetadataTree.tree = fmf.Tree(path)

+             except Exception:

+                 """Fmf initialization failed. Do not try initialize further for this path.

+                 """

+                 FmfMetadataTree.tree = False

          return self.tree

  

  
@@ -177,6 +186,8 @@ 

  

      """

      tree = FmfMetadataTree().get()

+     if not tree:

+         return default

      path.insert(0, 'standard-inventory-qcow2')

      value = default

      for provision in tree.prune(names=[".*/provision$"]):
@@ -187,12 +198,6 @@ 

              except (KeyError, TypeError):

                  value = default

                  break

-     try:

-         diagnose = distutils.util.strtobool(os.getenv("TEST_DEBUG", "0"))

-     except ValueError:

-         diagnose = 0

-     if diagnose:

-         sys.stderr.write("DIAGNOSE: fmf_get() for {}: {}\n".format(str(path), str(value)))

      return value

  

  

1 new commit added

  • Ignore FMF fails.
5 years ago

pretty please pagure-ci rebuild

It worked well with fmf (0.5.1) and tests that does not use fmf.

Commit 0ec1d09 fixes this pull-request

Pull-Request has been merged by astepano

5 years ago

Pull-Request has been merged by astepano

5 years ago