Merge "make mongodb unit test pass even without dev_setup env" into s…

…ervices-r10
cloudfoundry-attic · Mar 13, 2012 · 5cab0f4 · 5cab0f4
2 parents d87fd5a + 7df1576
commit 5cab0f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mongodb/spec/config/mongodb_backup.yml.erb b/mongodb/spec/config/mongodb_backup.yml.erb
@@ -2,7 +2,7 @@ service_name: mongodb
 backup_base_dir: <%= BACKUP_DIR %>
 local_db: sqlite3:/tmp/mongo/mongodb_node.db
 service_base_dir: /tmp/mongo/instances
-mongodump_path: <%= BINARY_DIR %>/mongodump
+mongodump_path: <%= BINARY_DIR %>mongodump
 timeout: 10
 logging:
   level: debug
diff --git a/mongodb/spec/mongodb_backup_spec.rb b/mongodb/spec/mongodb_backup_spec.rb
@@ -9,7 +9,8 @@
     @opts = get_node_config()
     @logger = @opts[:logger]
 
-    BINARY_DIR = File.dirname(@opts[:mongod_path])
+    @opts[:mongod_path].match "(.+#{File::SEPARATOR}).+"
+    BINARY_DIR = $1
 
     @config_template = ERB.new(File.read(TEMPLATE_FILE))
     config = @config_template.result(binding)