From d1e69d954ea403eb7f5d76c73ed80c248ac24bb3 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Fri, 15 Jan 2010 01:10:34 +0100
Subject: Remove format and category data from test case XML

---
 layman/tests/external.py                           |  2 +-
 .../tests/testfiles/format-subpath-category-1.xml  | 28 -------------------
 .../tests/testfiles/format-subpath-category-2.xml  | 31 ----------------------
 layman/tests/testfiles/subpath-1.xml               | 19 +++++++++++++
 layman/tests/testfiles/subpath-2.xml               | 22 +++++++++++++++
 5 files changed, 42 insertions(+), 60 deletions(-)
 delete mode 100644 layman/tests/testfiles/format-subpath-category-1.xml
 delete mode 100644 layman/tests/testfiles/format-subpath-category-2.xml
 create mode 100644 layman/tests/testfiles/subpath-1.xml
 create mode 100644 layman/tests/testfiles/subpath-2.xml

diff --git a/layman/tests/external.py b/layman/tests/external.py
index 1c8815b..9b336ee 100644
--- a/layman/tests/external.py
+++ b/layman/tests/external.py
@@ -44,7 +44,7 @@ class FormatSubpathCategory(unittest.TestCase):
     def _run(self, number):
         config = {}
         filename1 = os.path.join(HERE, 'testfiles',
-                'format-subpath-category-%d.xml' % number)
+                'subpath-%d.xml' % number)
 
         # Read, write, re-read, compare
         os1 = Overlays([filename1], config)
diff --git a/layman/tests/testfiles/format-subpath-category-1.xml b/layman/tests/testfiles/format-subpath-category-1.xml
deleted file mode 100644
index 41ae2a9..0000000
--- a/layman/tests/testfiles/format-subpath-category-1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layman>
-  <overlay
-      name="a_name"
-      contact="a_owner@example.org"
-      type="tar"
-      src="http://example.org/a.tar.bz2"
-      format="bz2"
-      category="a_cat">
-    <description>a_desc</description>
-  </overlay>
-  <overlay
-      name="b_name"
-      contact="b_owner@example.org"
-      type="tar"
-      src="http://example.org/b.tar.gz"
-      subpath="b_path">
-    <description>b_desc</description>
-  </overlay>
-  <overlay
-      name="c_name"
-      contact="c_owner@example.org"
-      type="cvs"
-      src=":pserver:username@example.org:/usr/local/cvs-repository"
-      subpath="c_path">
-    <description>c_desc</description>
-  </overlay>
-</layman>
diff --git a/layman/tests/testfiles/format-subpath-category-2.xml b/layman/tests/testfiles/format-subpath-category-2.xml
deleted file mode 100644
index 8b84d2d..0000000
--- a/layman/tests/testfiles/format-subpath-category-2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE repositories SYSTEM "/dtd/repositories.dtd">
-<repositories xmlns="" version="1.0">
-  <repo>
-    <name>a_name</name>
-    <description>a_desc</description>
-    <owner>
-      <email>a_owner@example.org</email>
-    </owner>
-    <source type="tar" format="bz2">http://example.org/a.tar.bz2</source>
-    <category>a_cat</category>
-  </repo>
-  <repo>
-    <name>b_name</name>
-    <description>b_desc</description>
-    <owner>
-      <email>b_owner@example.org</email>
-    </owner>
-    <source type="tar">http://example.org/b.tar.gz</source>
-    <subpath>b_path</subpath>
-  </repo>
-  <repo>
-    <name>c_name</name>
-    <description>c_desc</description>
-    <owner>
-      <email>c_owner@example.org</email>
-    </owner>
-    <source type="cvs">:pserver:username@example.org:/usr/local/cvs-repository</source>
-    <subpath>c_path</subpath>
-  </repo>
-</repositories>
diff --git a/layman/tests/testfiles/subpath-1.xml b/layman/tests/testfiles/subpath-1.xml
new file mode 100644
index 0000000..ddb0e3e
--- /dev/null
+++ b/layman/tests/testfiles/subpath-1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layman>
+  <overlay
+      name="b_name"
+      contact="b_owner@example.org"
+      type="tar"
+      src="http://example.org/b.tar.gz"
+      subpath="b_path">
+    <description>b_desc</description>
+  </overlay>
+  <overlay
+      name="c_name"
+      contact="c_owner@example.org"
+      type="cvs"
+      src=":pserver:username@example.org:/usr/local/cvs-repository"
+      subpath="c_path">
+    <description>c_desc</description>
+  </overlay>
+</layman>
diff --git a/layman/tests/testfiles/subpath-2.xml b/layman/tests/testfiles/subpath-2.xml
new file mode 100644
index 0000000..aa11497
--- /dev/null
+++ b/layman/tests/testfiles/subpath-2.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE repositories SYSTEM "/dtd/repositories.dtd">
+<repositories xmlns="" version="1.0">
+  <repo>
+    <name>b_name</name>
+    <description>b_desc</description>
+    <owner>
+      <email>b_owner@example.org</email>
+    </owner>
+    <source type="tar">http://example.org/b.tar.gz</source>
+    <subpath>b_path</subpath>
+  </repo>
+  <repo>
+    <name>c_name</name>
+    <description>c_desc</description>
+    <owner>
+      <email>c_owner@example.org</email>
+    </owner>
+    <source type="cvs">:pserver:username@example.org:/usr/local/cvs-repository</source>
+    <subpath>c_path</subpath>
+  </repo>
+</repositories>
-- 
cgit v1.2.3-1-g7c22