From b71e8f74d8cc8633397198636471701007d7ee4a Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Tue, 28 May 2019 14:17:25 +0300 Subject: [PATCH] Configure $PACKAGE for beakerlib reports this makes it more clear that we are testing the installed RPM instead of sources --- test/composertest.py | 5 ++++- tests/test_cli.sh | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/composertest.py b/test/composertest.py index d948a38d..d01c69ee 100644 --- a/test/composertest.py +++ b/test/composertest.py @@ -77,7 +77,10 @@ class ComposerTestCase(unittest.TestCase): return subprocess.run(self.ssh_command + command, **args) def runCliTest(self, script): - r = self.execute(["CLI=/usr/bin/composer-cli", "TEST=" + self.id(), "/tests/test_cli.sh", script]) + r = self.execute(["CLI=/usr/bin/composer-cli", + "TEST=" + self.id(), + "PACKAGE=composer-cli", + "/tests/test_cli.sh", script]) self.assertEqual(r.returncode, 0) diff --git a/tests/test_cli.sh b/tests/test_cli.sh index 32112718..9395a277 100755 --- a/tests/test_cli.sh +++ b/tests/test_cli.sh @@ -53,6 +53,7 @@ if [ -z "$CLI" ]; then # start the lorax-composer daemon ./src/sbin/lorax-composer --sharedir $SHARE_DIR $BLUEPRINTS_DIR & else + export PACKAGE="composer-cli" SHARE_DIR="/usr/share/lorax" setup_tests $SHARE_DIR systemctl restart lorax-composer