From d6463e70eeb0ad3d93788a3e0f13e2007be54c50 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@collabora.co.uk>
Date: Thu, 9 Jun 2011 10:13:45 +0200
Subject: Complete testing of global config files and directories.

---
 tests/files/system-modules/one       | 3 +++
 tests/files/system-modules/two       | 3 +++
 tests/files/test-system-invalid.conf | 3 +++
 tests/files/test-system-merge.conf   | 7 +++++++
 tests/files/test-system-none.conf    | 8 ++++++++
 tests/files/test-system-only.conf    | 8 ++++++++
 tests/files/test-user-invalid.conf   | 3 +++
 tests/files/test-user-only.conf      | 4 ++++
 tests/files/test-user.conf           | 3 +++
 tests/files/user-modules/one         | 2 ++
 tests/files/user-modules/three       | 3 +++
 11 files changed, 47 insertions(+)
 create mode 100644 tests/files/system-modules/one
 create mode 100644 tests/files/system-modules/two
 create mode 100644 tests/files/test-system-invalid.conf
 create mode 100644 tests/files/test-system-merge.conf
 create mode 100644 tests/files/test-system-none.conf
 create mode 100644 tests/files/test-system-only.conf
 create mode 100644 tests/files/test-user-invalid.conf
 create mode 100644 tests/files/test-user-only.conf
 create mode 100644 tests/files/test-user.conf
 create mode 100644 tests/files/user-modules/one
 create mode 100644 tests/files/user-modules/three

(limited to 'tests/files')

diff --git a/tests/files/system-modules/one b/tests/files/system-modules/one
new file mode 100644
index 0000000..e48b76d
--- /dev/null
+++ b/tests/files/system-modules/one
@@ -0,0 +1,3 @@
+
+module: /path/to/module-one
+setting: system1
\ No newline at end of file
diff --git a/tests/files/system-modules/two b/tests/files/system-modules/two
new file mode 100644
index 0000000..66e24dc
--- /dev/null
+++ b/tests/files/system-modules/two
@@ -0,0 +1,3 @@
+
+module: /path/to/module-two
+setting: system2
\ No newline at end of file
diff --git a/tests/files/test-system-invalid.conf b/tests/files/test-system-invalid.conf
new file mode 100644
index 0000000..344ee96
--- /dev/null
+++ b/tests/files/test-system-invalid.conf
@@ -0,0 +1,3 @@
+
+# Invalid user-config setting
+user-config: bad
diff --git a/tests/files/test-system-merge.conf b/tests/files/test-system-merge.conf
new file mode 100644
index 0000000..978427d
--- /dev/null
+++ b/tests/files/test-system-merge.conf
@@ -0,0 +1,7 @@
+
+# Merge in user config
+user-config: merge
+
+key1: system1
+key2: system2
+key3: system3
\ No newline at end of file
diff --git a/tests/files/test-system-none.conf b/tests/files/test-system-none.conf
new file mode 100644
index 0000000..95351e6
--- /dev/null
+++ b/tests/files/test-system-none.conf
@@ -0,0 +1,8 @@
+
+# Only user config
+user-config: none
+
+# These values will not be overriden
+key1: system1
+key2: system2
+key3: system3
\ No newline at end of file
diff --git a/tests/files/test-system-only.conf b/tests/files/test-system-only.conf
new file mode 100644
index 0000000..589f1c7
--- /dev/null
+++ b/tests/files/test-system-only.conf
@@ -0,0 +1,8 @@
+
+# Only user config
+user-config: only
+
+# This stuff will be ignored
+key1: system1
+key2: system2
+key3: system3
\ No newline at end of file
diff --git a/tests/files/test-user-invalid.conf b/tests/files/test-user-invalid.conf
new file mode 100644
index 0000000..344ee96
--- /dev/null
+++ b/tests/files/test-user-invalid.conf
@@ -0,0 +1,3 @@
+
+# Invalid user-config setting
+user-config: bad
diff --git a/tests/files/test-user-only.conf b/tests/files/test-user-only.conf
new file mode 100644
index 0000000..3224c01
--- /dev/null
+++ b/tests/files/test-user-only.conf
@@ -0,0 +1,4 @@
+
+user-config: only
+key2: user2
+key3: user3
\ No newline at end of file
diff --git a/tests/files/test-user.conf b/tests/files/test-user.conf
new file mode 100644
index 0000000..369544a
--- /dev/null
+++ b/tests/files/test-user.conf
@@ -0,0 +1,3 @@
+
+key2: user2
+key3: user3
\ No newline at end of file
diff --git a/tests/files/user-modules/one b/tests/files/user-modules/one
new file mode 100644
index 0000000..c371e4a
--- /dev/null
+++ b/tests/files/user-modules/one
@@ -0,0 +1,2 @@
+
+setting: user1
\ No newline at end of file
diff --git a/tests/files/user-modules/three b/tests/files/user-modules/three
new file mode 100644
index 0000000..c8d800a
--- /dev/null
+++ b/tests/files/user-modules/three
@@ -0,0 +1,3 @@
+
+module: /path/to/module-three
+setting: user3
\ No newline at end of file
-- 
cgit v1.1