From 9dadebb5019a6ad98f5185e2d3f9fb63e1f0cb55 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 17 Dec 2014 10:43:01 -0500
Subject: [PATCH] tests: Fix two bugs in tests revealed by new remote changes

---
 tests/test-admin-deploy-2.sh | 1 -
 tests/test-sysroot.js        | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/test-admin-deploy-2.sh b/tests/test-admin-deploy-2.sh
index 0667ed5d..0d7ccf03 100755
--- a/tests/test-admin-deploy-2.sh
+++ b/tests/test-admin-deploy-2.sh
@@ -46,7 +46,6 @@ ostree admin --sysroot=sysroot upgrade --os=testos
 bootcsum2=${bootcsum}
 os_repository_new_commit "1"
 bootcsum3=${bootcsum}
-ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime
 ostree admin --sysroot=sysroot upgrade --os=testos
 
 rev=${newrev}
diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js
index da9c7323..fc8e91fd 100644
--- a/tests/test-sysroot.js
+++ b/tests/test-sysroot.js
@@ -64,12 +64,9 @@ assertEquals(deployments.length, 0);
 //// Add the remote, and do a pull
 
 let [,sysrootRepo] = sysroot.get_repo(null);
-let sysrootRepoConfig = sysrootRepo.get_config();
-let testosRefSection = 'remote "testos"';
-sysrootRepoConfig.set_string(testosRefSection, 'url', 'file://' + upstreamRepo.get_path().get_path());
-sysrootRepoConfig.set_boolean(testosRefSection, 'gpg-verify', false);
-sysrootRepoConfig.set_string_list(testosRefSection, 'branches', [runtimeRef]);
-
+sysrootRepo.remote_add('testos', 'file://' + upstreamRepo.get_path().get_path(),
+		       GLib.Variant.new('a{sv}', {'gpg-verify': GLib.Variant.new('b', false),
+						  'branches': GLib.Variant.new('as', [runtimeRef])}), null);
 sysrootRepo.pull('testos', null, 0, null, null);
 
 //// TEST: We can deploy one tree