From fe87ad4f293ed84ea980aa855a44e873467062f2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 10 Sep 2018 08:50:33 -0400
Subject: [PATCH] tests: Drop conditionals for Rust enablement

We now hard require it, so change these tests to do so as
well.

Closes: #1544
Approved by: jlebon
---
 tests/compose-tests/test-basic.sh         | 14 +++++---------
 tests/compose-tests/test-compose2jigdo.sh | 10 +++-------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/tests/compose-tests/test-basic.sh b/tests/compose-tests/test-basic.sh
index 45e5d56e..d245b980 100755
--- a/tests/compose-tests/test-basic.sh
+++ b/tests/compose-tests/test-basic.sh
@@ -33,17 +33,13 @@ echo "ok autovar"
 ostree --repo=${repobuild} cat ${treeref} /usr/lib/systemd/system-preset/40-rpm-ostree-auto.preset > preset.txt
 assert_file_has_content preset.txt '^enable ostree-remount.service$'
 
-if ! rpm-ostree --version | grep -q rust; then
-  echo "ok yaml (SKIP)"
-else
-  prepare_compose_test "from-yaml"
-  python <<EOF
+prepare_compose_test "from-yaml"
+python <<EOF
 import json, yaml
 jd=json.load(open("$treefile"))
 with open("$treefile.yaml", "w") as f:
   f.write(yaml.dump(jd))
 EOF
-  export treefile=$treefile.yaml
-  runcompose
-  echo "ok yaml"
-fi
+export treefile=$treefile.yaml
+runcompose
+echo "ok yaml"
diff --git a/tests/compose-tests/test-compose2jigdo.sh b/tests/compose-tests/test-compose2jigdo.sh
index 14206924..f182ba25 100755
--- a/tests/compose-tests/test-compose2jigdo.sh
+++ b/tests/compose-tests/test-compose2jigdo.sh
@@ -8,18 +8,14 @@ dn=$(cd $(dirname $0) && pwd)
 . ${dn}/../common/libtest.sh
 
 prepare_compose_test "compose2jigdo"
-if rpm-ostree --version | grep -q rust; then
-    pysetjsonmember "rojig" '{ "name": "fedora-atomic-host", "license": "MIT", "summary": "Fedora Atomic Host"}'
-    python <<EOF
+pysetjsonmember "rojig" '{ "name": "fedora-atomic-host", "license": "MIT", "summary": "Fedora Atomic Host"}'
+python <<EOF
 import json, yaml
 jd=json.load(open("$treefile"))
 with open("$treefile.yaml", "w") as f:
   f.write(yaml.dump(jd))
 EOF
-    export treefile=$treefile.yaml
-else
-    pysetjsonmember "ex-rojig-spec" '"fedora-atomic-host-oirpm.spec"'
-fi
+export treefile=$treefile.yaml
 
 mkdir cache
 mkdir jigdo-output