From fd274ecbb19191f4003dae29ff8359dfb376d4b4 Mon Sep 17 00:00:00 2001
From: mpl <mathieu.lonjaret@gmail.com>
Date: Mon, 12 Nov 2012 23:04:30 +0100
Subject: [PATCH] fix serverconfig tests, broken because of discovery move from
 ui to root

Change-Id: I3e2e5c9280f9ea691d9143aa2bc0a971a6dce325
---
 pkg/serverconfig/testdata/default-want.json      | 4 ++--
 pkg/serverconfig/testdata/listenbase-want.json   | 4 ++--
 pkg/serverconfig/testdata/tls-want.json          | 4 ++--
 pkg/serverconfig/testdata/with_blog-want.json    | 4 ++--
 pkg/serverconfig/testdata/with_gallery-want.json | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/serverconfig/testdata/default-want.json b/pkg/serverconfig/testdata/default-want.json
index c959c1770..e295caa17 100644
--- a/pkg/serverconfig/testdata/default-want.json
+++ b/pkg/serverconfig/testdata/default-want.json
@@ -6,6 +6,8 @@
 		"/": {
 			"handler": "root",
 			"handlerArgs": {
+				"blobRoot": "/bs-and-maybe-also-index/",
+				"searchRoot": "/my-search/",
 				"stealth": false
 			}
 		},
@@ -13,8 +15,6 @@
 		"/ui/": {
 			"handler": "ui",
 			"handlerArgs": {
-				"blobRoot": "/bs-and-maybe-also-index/",
-				"searchRoot": "/my-search/",
 				"jsonSignRoot": "/sighelper/",
 				"cache": "/cache/",
 				"scaledImage": "lrucache"
diff --git a/pkg/serverconfig/testdata/listenbase-want.json b/pkg/serverconfig/testdata/listenbase-want.json
index 370c62dc8..45d616732 100644
--- a/pkg/serverconfig/testdata/listenbase-want.json
+++ b/pkg/serverconfig/testdata/listenbase-want.json
@@ -7,6 +7,8 @@
 		"/": {
 			"handler": "root",
 			"handlerArgs": {
+				"blobRoot": "/bs-and-maybe-also-index/",
+				"searchRoot": "/my-search/",
 				"stealth": false
 			}
 		},
@@ -14,8 +16,6 @@
 		"/ui/": {
 			"handler": "ui",
 			"handlerArgs": {
-				"blobRoot": "/bs-and-maybe-also-index/",
-				"searchRoot": "/my-search/",
 				"jsonSignRoot": "/sighelper/",
 				"cache": "/cache/",
 				"scaledImage": "lrucache"
diff --git a/pkg/serverconfig/testdata/tls-want.json b/pkg/serverconfig/testdata/tls-want.json
index d73dcde23..a85bd44bd 100644
--- a/pkg/serverconfig/testdata/tls-want.json
+++ b/pkg/serverconfig/testdata/tls-want.json
@@ -8,6 +8,8 @@
 		"/": {
 			"handler": "root",
 			"handlerArgs": {
+				"blobRoot": "/bs-and-maybe-also-index/",
+				"searchRoot": "/my-search/",
 				"stealth": false
 			}
 		},
@@ -15,8 +17,6 @@
 		"/ui/": {
 			"handler": "ui",
 			"handlerArgs": {
-				"blobRoot": "/bs-and-maybe-also-index/",
-				"searchRoot": "/my-search/",
 				"jsonSignRoot": "/sighelper/",
 				"cache": "/cache/",
 				"scaledImage": "lrucache"
diff --git a/pkg/serverconfig/testdata/with_blog-want.json b/pkg/serverconfig/testdata/with_blog-want.json
index f5301419f..570c36c17 100644
--- a/pkg/serverconfig/testdata/with_blog-want.json
+++ b/pkg/serverconfig/testdata/with_blog-want.json
@@ -6,6 +6,8 @@
 		"/": {
 			"handler": "root",
 			"handlerArgs": {
+				"blobRoot": "/bs-and-maybe-also-index/",
+				"searchRoot": "/my-search/",
 				"stealth": false
 			}
 		},
@@ -25,8 +27,6 @@
 		"/ui/": {
 			"handler": "ui",
 			"handlerArgs": {
-				"blobRoot": "/bs-and-maybe-also-index/",
-				"searchRoot": "/my-search/",
 				"jsonSignRoot": "/sighelper/",
 				"cache": "/cache/",
 				"scaledImage": "lrucache",
diff --git a/pkg/serverconfig/testdata/with_gallery-want.json b/pkg/serverconfig/testdata/with_gallery-want.json
index 77e5aa2ad..1632c9864 100644
--- a/pkg/serverconfig/testdata/with_gallery-want.json
+++ b/pkg/serverconfig/testdata/with_gallery-want.json
@@ -6,6 +6,8 @@
 		"/": {
 			"handler": "root",
 			"handlerArgs": {
+				"blobRoot": "/bs-and-maybe-also-index/",
+				"searchRoot": "/my-search/",
 				"stealth": false
 			}
 		},
@@ -27,8 +29,6 @@
 		"/ui/": {
 			"handler": "ui",
 			"handlerArgs": {
-				"blobRoot": "/bs-and-maybe-also-index/",
-				"searchRoot": "/my-search/",
 				"jsonSignRoot": "/sighelper/",
 				"cache": "/cache/",
 				"scaledImage": "lrucache",