[reprotest] 02/07: main: a few minor bugfixes

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository reprotest.

commit 5ffb3ece607d127a8495dfa01202bd7737ca264c
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Sep 26 15:37:59 2017 +0200

    main: a few minor bugfixes
---
 reprotest/__init__.py   | 7 +++----
 tests/test_reprotest.py | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index cfd5623..b393438 100644
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -7,7 +7,6 @@ import configparser
 import contextlib
 import logging
 import os
-import pathlib
 import random
 import re
 import shlex
@@ -273,7 +272,7 @@ def corun_builds(test_args, testbed_args):
                 logging.log(5, "build %s: %r", name, build)
 
                 if testbed_init:
-                    check_exec(["sh", "-ec", testbed_init])
+                    testbed.check_exec(["sh", "-ec", testbed_init])
 
                 bctx.copydown(testbed)
                 bctx.run_build(testbed, build, artifact_pattern)
@@ -455,7 +454,7 @@ def cli_parser():
         help='Build command to execute. If this is "auto" then reprotest will '
         'guess how to build the given source_root, in which case various other '
         'options may be automatically set-if-unset. Default: auto'),
-    group1.add_argument('--store-dir', default=None, type=pathlib.Path,
+    group1.add_argument('--store-dir', default=None,
         help='Save the artifacts in this directory, which must be empty or '
         'non-existent. Otherwise, the artifacts will be deleted and you only '
         'see their hashes (if reproducible) or the diff output (if not).')
@@ -625,7 +624,7 @@ def run(argv, dry_run=None):
         artifact_pattern = artifact_pattern or values.artifact_pattern
         testbed_pre = testbed_pre or values.testbed_pre
         testbed_init = testbed_init or values.testbed_init
-        if diffoscope_args is not None:
+        if values.diffoscope_args is not None:
             diffoscope_args = values.diffoscope_args + diffoscope_args
 
     # Variations args
diff --git a/tests/test_reprotest.py b/tests/test_reprotest.py
index 99875a7..eaa6cd6 100644
--- a/tests/test_reprotest.py
+++ b/tests/test_reprotest.py
@@ -14,7 +14,7 @@ REPROTEST_TEST_SERVERS = os.getenv("REPROTEST_TEST_SERVERS", "null").split(",")
 REPROTEST_TEST_DONTVARY = os.getenv("REPROTEST_TEST_DONTVARY", "").split(",")
 
 if REPROTEST_TEST_DONTVARY:
-    REPROTEST += ["--vary=-" + ",-".join(REPROTEST_TEST_DONTVARY)]
+    REPROTEST += ["--vary=" + ",".join("-%s" % a for a in REPROTEST_TEST_DONTVARY if a)]
 
 TEST_VARIATIONS = frozenset(VARIATIONS.keys()) - frozenset(REPROTEST_TEST_DONTVARY)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reprotest.git