From 14203d77f43c02e60770dcbd4a9cb2b39b38bcd6 Mon Sep 17 00:00:00 2001
From: Xavier Chantry <shiningxc@gmail.com>
Date: Sun, 17 Aug 2008 13:45:05 +0200
Subject: Allow sync200 pactest to pass without libdownload.
This was a stupid and unimportant regression caused by commit
4476598e4e128f4595d5383ecb51a9576a447b5b .
When libdownload is not available, a xfercommand is needed for this pactest
to run properly.
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
pactest/tests/sync200.py | 15 ---------------
pactest/tests/sync200.py.in | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 15 deletions(-)
delete mode 100644 pactest/tests/sync200.py
create mode 100644 pactest/tests/sync200.py.in
(limited to 'pactest')
diff --git a/pactest/tests/sync200.py b/pactest/tests/sync200.py
deleted file mode 100644
index 9005bd3d..00000000
--- a/pactest/tests/sync200.py
+++ /dev/null
@@ -1,15 +0,0 @@
-self.description = "Synchronize the local database"
-
-sp1 = pmpkg("spkg1", "1.0-1")
-sp1.depends = ["spkg2"]
-sp2 = pmpkg("spkg2", "2.0-1")
-sp2.depends = ["spkg3"]
-sp3 = pmpkg("spkg3", "3.0-1")
-sp3.depends = ["spkg1"]
-
-for sp in sp1, sp2, sp3:
- self.addpkg2db("sync", sp)
-
-self.args = "-Sy"
-
-self.addrule("PACMAN_RETCODE=0")
diff --git a/pactest/tests/sync200.py.in b/pactest/tests/sync200.py.in
new file mode 100644
index 00000000..3c11f83f
--- /dev/null
+++ b/pactest/tests/sync200.py.in
@@ -0,0 +1,18 @@
+self.description = "Synchronize the local database"
+
+if not "download" in "@LIBS@":
+ self.option['XferCommand'] = ['/usr/bin/curl %u > %o']
+
+sp1 = pmpkg("spkg1", "1.0-1")
+sp1.depends = ["spkg2"]
+sp2 = pmpkg("spkg2", "2.0-1")
+sp2.depends = ["spkg3"]
+sp3 = pmpkg("spkg3", "3.0-1")
+sp3.depends = ["spkg1"]
+
+for sp in sp1, sp2, sp3:
+ self.addpkg2db("sync", sp)
+
+self.args = "-Sy"
+
+self.addrule("PACMAN_RETCODE=0")
--
cgit v1.2.3-70-g09d2