Die build.py, Die: Part 2 (LocalFetcher, Handlebar support, build script)

chrome/common/extensions/docs/server2/subversion_fetcher_test.py

Index: chrome/common/extensions/docs/server2/subversion_fetcher_test.py
diff --git a/chrome/common/extensions/docs/server2/resource_fetcher_test.py b/chrome/common/extensions/docs/server2/subversion_fetcher_test.py
similarity index 58%
rename from chrome/common/extensions/docs/server2/resource_fetcher_test.py
rename to chrome/common/extensions/docs/server2/subversion_fetcher_test.py
index f671bf92e51c93259a65c279ac3faae1d3c45a01..9faf29d2712ad876d7f7541ebcf3776f55764f7f 100755
--- a/chrome/common/extensions/docs/server2/resource_fetcher_test.py
+++ b/chrome/common/extensions/docs/server2/subversion_fetcher_test.py
@@ -3,26 +3,28 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import os
 import unittest
 import test_urlfetch
 
-from resource_fetcher import SubversionFetcher
+from subversion_fetcher import SubversionFetcher
 
 class TestSubversionFetcher(SubversionFetcher):
   def _GetURLFromBranch(self, branch):
     if branch == 'trunk':
-      return 'subversion_fetcher/trunk/'
-    return 'subversion_fetcher/' + branch + '/'
+      return os.path.join('subversion_fetcher', 'trunk')
+    return os.path.join('subversion_fetcher', branch)
+
 
 class SubversionFetcherTest(unittest.TestCase):
   def testFetchResource(self):
-    s_fetcher = TestSubversionFetcher(test_urlfetch)
+    fetcher = TestSubversionFetcher('', test_urlfetch)
     self.assertEquals('trunk test\n',
-        s_fetcher.FetchResource('trunk', 'test.json').content)
+        fetcher.FetchResource('trunk', '/test.txt').content)
     self.assertEquals('branch1 test\n',
-        s_fetcher.FetchResource('branch1', 'test.json').content)
+        fetcher.FetchResource('branch1', '/test.txt').content)
     self.assertEquals('branch2 test\n',
-        s_fetcher.FetchResource('branch2', 'test.json').content)
+        fetcher.FetchResource('branch2', '/test.txt').content)
 
 if __name__ == '__main__':
   unittest.main()